equal
deleted
inserted
replaced
358 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
358 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
359 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
359 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
360 @@ -0,0 +1,1 @@ |
360 @@ -0,0 +1,1 @@ |
361 +a |
361 +a |
362 |
362 |
363 Check that we don't have any troubled cset now: |
363 Check that we don't have any unstable cset now: |
364 $ hg evolve -l |
364 $ hg evolve -l |
365 $ cd .. |
365 $ cd .. |
366 |
366 |
367 Testing the case when csets are on different parent and no conflict in relocation and merging: |
367 Testing the case when csets are on different parent and no conflict in relocation and merging: |
368 ---------------------------------------------------------------------------------------------- |
368 ---------------------------------------------------------------------------------------------- |