diff -r cd1d5b7308be -r 4e0f1aae8d24 tests/test-evolve.t --- a/tests/test-evolve.t Thu Aug 23 03:14:03 2012 +0200 +++ b/tests/test-evolve.t Thu Aug 23 12:51:34 2012 +0200 @@ -509,5 +509,47 @@ db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 {'date': '* *', 'user': 'test'} (glob) a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 {'date': '* *', 'user': 'test'} (glob) - $ cd .. +Test touch + $ glog + @ 8:920e58bb443b@default(draft) conflict + | + o 6:acb28cd497b7@default(draft) add 1 + | + o 5:0b9e50c35132@default(draft) add 3 + | + o 4:ce341209337f@default(draft) add 4 + | + | o 1:73d38bb17fd7@default(draft) add 1 + |/ + o 0:8685c6d34325@default(draft) add 0 + + $ hg touch + $ glog + @ 9:7a2f49fdcf11@default(draft) conflict + | + o 6:acb28cd497b7@default(draft) add 1 + | + o 5:0b9e50c35132@default(draft) add 3 + | + o 4:ce341209337f@default(draft) add 4 + | + | o 1:73d38bb17fd7@default(draft) add 1 + |/ + o 0:8685c6d34325@default(draft) add 0 + + $ hg touch . + $ glog + @ 10:ce7e3d9b3afe@default(draft) conflict + | + o 6:acb28cd497b7@default(draft) add 1 + | + o 5:0b9e50c35132@default(draft) add 3 + | + o 4:ce341209337f@default(draft) add 4 + | + | o 1:73d38bb17fd7@default(draft) add 1 + |/ + o 0:8685c6d34325@default(draft) add 0 + +