mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
da332667e9
When using hg.tagsbranch, all conversions fail at transcribing the source repo topology with conversion scenarios interleaving: - initial repo conversion, - then upstream tag - then later incremental conversion The problem is caused by the usage of the last source revid as source revid for the tagnode in the revision map. On a later incremental conversion, when resolving some child commit of the true last source revid, convert will parent the nodes to the tag node. If using tagsbranch you get a bad topology where all incremental commit nodes end up in the tag branch. Analysis and test by Edouard Gomez <ed.gomez@free.fr>
30 lines
790 B
Plaintext
30 lines
790 B
Plaintext
marked working directory as branch branch0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
% convert
|
|
3 adda
|
|
2 changea
|
|
1 addb
|
|
pulling from default into branch0
|
|
1 changesets found
|
|
0 mergeab
|
|
pulling from default into branch0
|
|
1 changesets found
|
|
marked working directory as branch branch1
|
|
marked working directory as branch branch2
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
marked working directory as branch branch3
|
|
% incremental conversion
|
|
2 c1
|
|
pulling from branch0 into branch1
|
|
4 changesets found
|
|
1 c2
|
|
pulling from branch0 into branch2
|
|
4 changesets found
|
|
0 c3
|
|
pulling from branch2 into branch3
|
|
5 changesets found
|
|
pulling from branch1 into branch3
|
|
1 changesets found
|