martinvonz added inline comments.
INLINE COMMENTS
> test-bundle-bookmarks.t:37-63
> +Bookmarks are restored when unbundling
> + $ hg bundle --all bundle
> + 5 changesets found
> + $ hg debugbundle bundle
> + Stream params: {Compression: BZ}
> + changegroup -- {nbchanges: 5, version: 02}
> + 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
Can we have a similar test case where we create divergence? Create a fork in
the graph in the debugdrawdag call above. Let's say you have commit F that
branches off of B, then do something like this:
$ hg bundle --all bundle
$ hg strip --no-backup C
$ hg bookmarks -f -r F D1
$ hg unbundle -q bundle
$ hg log -G -T '{desc} {bookmarks}\n'
o E
|
o D D1 D2
|
o C
|
| o F D1@1
|/
o B
|
o A A1
I don't know if "@1" is the appropriate divergence marker, but I can't think of
a better one. I haven't even looked at your code to try to guess what it would
be in practice (if it would work at all).
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2880
To: lothiraldan, #hg-reviewers
Cc: martinvonz, indygreg, pulkit, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
