Mercurial > evolve

comparison tests/test-topic-debugcb.t @ 2900:1928e9c802dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convertbookmark: add logic to skip revisions with multiple bookmarks When a user tries to converts a bookmark to topic which is on a changeset with more bookmarks we skip that.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 14 Aug 2017 14:36:11 +0530
parents 32306ee32806
children 52e6b28704a7
comparison
equal deleted inserted replaced
2899:32306ee32806 2900:1928e9c802dd
104 | topic: secondfix 104 | topic: secondfix
105 | o [4:ca8825a7eb18] Second commit 105 | o [4:ca8825a7eb18] Second commit
106 |/ topic: hellos 106 |/ topic: hellos
107 o [0:3caf92e45cfb] First commit 107 o [0:3caf92e45cfb] First commit
108 108
109 XXX: When we have multiple bookmarks on the same changeset, we should skip that
110 and do nothing. This should be fixed.
111
112 $ hg debugconvertbookmark --all 109 $ hg debugconvertbookmark --all
113 switching to topic book1 110 skipping '7' as it has multiple bookmarks on it
114 changed topic to "book1" on 3 revisions
115 changed topic to "book2" on 3 revisions
116 $ hg log -G 111 $ hg log -G
117 o [13:f979f772bd7d] Trying multiple bookmarks 112 @ [7:7c46b4bbdda3] Trying multiple bookmarks
118 | topic: book2 113 | bookmark: book1
119 o [12:2397fdab7b79] Fixing second 114 | bookmark:book2
120 | topic: book2 115 | topic: secondfix
121 o [11:0dd194861ea1] Fixing first 116 o [6:6efc0524f97a] Fixing second
122 | topic: book2 117 | topic: secondfix
123 | @ [10:e738ed1df4b2] Trying multiple bookmarks 118 o [5:0a4244c62a16] Fixing first
124 | | topic: book1 119 | topic: secondfix
125 | o [9:4198fce21412] Fixing second
126 | | topic: book1
127 | o [8:221a9ddef504] Fixing first
128 |/ topic: book1
129 | o [4:ca8825a7eb18] Second commit 120 | o [4:ca8825a7eb18] Second commit
130 |/ topic: hellos 121 |/ topic: hellos
131 o [0:3caf92e45cfb] First commit 122 o [0:3caf92e45cfb] First commit
132 123