equal
deleted
inserted
replaced
31 .. |
31 .. |
32 .. * chain from B |
32 .. * chain from B |
33 |
33 |
34 initial |
34 initial |
35 |
35 |
36 $ mkdir A.2 |
36 $ setuprepos A.2 |
37 $ cd A.2 |
37 creating test repo for test case A.2 |
38 $ hg init main |
38 - pulldest |
39 $ hg init pushdest |
39 - main |
40 $ hg init pulldest |
40 - pushdest |
|
41 cd into `main` and proceed with env setup |
41 $ cd main |
42 $ cd main |
42 $ mkcommit O |
|
43 $ hg phase --public . |
|
44 $ hg push -q ../pushdest |
|
45 $ hg push -q ../pulldest |
|
46 $ mkcommit A |
43 $ mkcommit A |
47 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` |
44 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` |
48 $ hg up .^ |
45 $ hg up .^ |
49 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
46 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
50 $ mkcommit B |
47 $ mkcommit B |