equal
deleted
inserted
replaced
45 | x 1:102a90ea7b4a@default(draft) bk:[] addb |
45 | x 1:102a90ea7b4a@default(draft) bk:[] addb |
46 |/ |
46 |/ |
47 o 0:07f494440405@default(draft) bk:[] adda |
47 o 0:07f494440405@default(draft) bk:[] adda |
48 |
48 |
49 $ hg debugobsolete |
49 $ hg debugobsolete |
50 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 {'date': '* *', 'user': 'test'} (glob) |
50 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'user': 'test'} (glob) |
51 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {'date': '* *', 'user': 'test'} (glob) |
51 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 (*) {'p1': '102a90ea7b4a3361e4082ed620918c261189a36a', 'user': 'test'} (glob) |
52 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {'date': '* *', 'user': 'test'} (glob) |
52 cce2c55b896511e0b6e04173c9450ba822ebc740 0 (*) {'p1': '102a90ea7b4a3361e4082ed620918c261189a36a', 'user': 'test'} (glob) |
53 |
53 |
54 Test evolve with conflict |
54 Test evolve with conflict |
55 |
55 |
56 $ ls |
56 $ ls |
57 a |
57 a |