tests/test-uncommit.t
changeset 346 f4302a2079f4
parent 318 da7509e7b50c
child 359 43f79983f638
equal deleted inserted replaced
343:6b92f8d5ae58 346:f4302a2079f4
   218   $ hg cat -r . e
   218   $ hg cat -r . e
   219   e
   219   e
   220   $ glog --hidden
   220   $ glog --hidden
   221   @  4:e8db4aa611f6@bar(stable/draft) touncommit
   221   @  4:e8db4aa611f6@bar(stable/draft) touncommit
   222   |
   222   |
   223   | o  3:5eb72dbe0cb4@bar(extinct/secret) touncommit
   223   | x  3:5eb72dbe0cb4@bar(extinct/secret) touncommit
   224   |/
   224   |/
   225   o    2:f63b90038565@default(stable/draft) merge
   225   o    2:f63b90038565@default(stable/draft) merge
   226   |\
   226   |\
   227   | o  1:f15c744d48e8@default(stable/draft) addmore
   227   | o  1:f15c744d48e8@default(stable/draft) addmore
   228   |
   228   |
   264   $ glog --hidden
   264   $ glog --hidden
   265   @  5:c706fe2c12f8@bar(stable/secret) touncommit
   265   @  5:c706fe2c12f8@bar(stable/secret) touncommit
   266   |
   266   |
   267   | o  4:e8db4aa611f6@bar(stable/draft) touncommit
   267   | o  4:e8db4aa611f6@bar(stable/draft) touncommit
   268   |/
   268   |/
   269   | o  3:5eb72dbe0cb4@bar(extinct/secret) touncommit
   269   | x  3:5eb72dbe0cb4@bar(extinct/secret) touncommit
   270   |/
   270   |/
   271   o    2:f63b90038565@default(stable/draft) merge
   271   o    2:f63b90038565@default(stable/draft) merge
   272   |\
   272   |\
   273   | o  1:f15c744d48e8@default(stable/draft) addmore
   273   | o  1:f15c744d48e8@default(stable/draft) addmore
   274   |
   274   |