##// END OF EJS Templates
test-copies: improve description of the B+F case...
marmoute -
r47292:f8888f5c default
parent child Browse files
Show More
@@ -358,7 +358,7 b' Merge:'
358 - one with change to an unrelated file (b)
358 - one with change to an unrelated file (b)
359 - one overwriting a file (d) with a rename (from h to i to d)
359 - one overwriting a file (d) with a rename (from h to i to d)
360
360
361 $ case_desc="simple merge"
361 $ case_desc="simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d)"
362
362
363 $ hg up 'desc("i-2")'
363 $ hg up 'desc("i-2")'
364 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
364 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -389,9 +389,9 b' Merge:'
389 $ hg ci -m "mFBm-0 $case_desc - the other way"
389 $ hg ci -m "mFBm-0 $case_desc - the other way"
390 created new head
390 created new head
391 $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
391 $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
392 @ 24 mFBm-0 simple merge - the other way
392 @ 24 mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
393 |\
393 |\
394 +---o 23 mBFm-0 simple merge - one way
394 +---o 23 mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
395 | |/
395 | |/
396 | o 22 f-2: rename i -> d
396 | o 22 f-2: rename i -> d
397 | |
397 | |
@@ -695,7 +695,7 b' Summary of all created cases'
695 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way
695 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way
696 mBCm-1 re-add d
696 mBCm-1 re-add d
697 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
697 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
698 mBFm-0 simple merge - one way
698 mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
699 mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
699 mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
700 mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way
700 mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way
701 mCBm-1 re-add d
701 mCBm-1 re-add d
@@ -704,7 +704,7 b' Summary of all created cases'
704 mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
704 mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
705 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
705 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
706 mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way
706 mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way
707 mFBm-0 simple merge - the other way
707 mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
708 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
708 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
709 mGCm-0 merge updated/deleted - revive the file (updated content) - the other way
709 mGCm-0 merge updated/deleted - revive the file (updated content) - the other way
710 mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way
710 mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way
@@ -1314,9 +1314,9 b' Merge:'
1314 - one overwriting a file (d) with a rename (from h to i to d)
1314 - one overwriting a file (d) with a rename (from h to i to d)
1315
1315
1316 $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
1316 $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
1317 o 24 mFBm-0 simple merge - the other way
1317 o 24 mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
1318 |\
1318 |\
1319 +---o 23 mBFm-0 simple merge - one way
1319 +---o 23 mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
1320 | |/
1320 | |/
1321 | o 22 f-2: rename i -> d
1321 | o 22 f-2: rename i -> d
1322 | |
1322 | |
General Comments 0
You need to be logged in to leave comments. Login now