equal
deleted
inserted
replaced
49 |/ |
49 |/ |
50 o 0:07f494440405@default(draft) bk:[] adda |
50 o 0:07f494440405@default(draft) bk:[] adda |
51 |
51 |
52 $ hg debugobsolete |
52 $ hg debugobsolete |
53 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
53 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
54 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} |
54 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
55 |
55 |
56 Test evolve with conflict |
56 Test evolve with conflict |
57 |
57 |
58 $ ls |
58 $ ls |
59 a |
59 a |