Mercurial > evolve
comparison tests/test-uncommit.t @ 1751:bc590681de77 mercurial-3.4
merge with future 5.5
All was fine for 3.4.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 28 Oct 2016 17:02:56 +0200 |
| parents | 3c7f98753e37 b0a67ebc464e |
| children | 6d54fd20bb81 |
comparison
equal
deleted
inserted
replaced
| 1708:be726abb5f91 | 1751:bc590681de77 |
|---|---|
| 116 o | 116 o |
| 117 | 117 |
| 118 Add a couple of bookmarks | 118 Add a couple of bookmarks |
| 119 | 119 |
| 120 $ glog --hidden | 120 $ glog --hidden |
| 121 @ 3:5eb72dbe0cb4@bar(stable/draft) touncommit | 121 @ 3:5eb72dbe0cb4@bar(/draft) touncommit |
| 122 | | 122 | |
| 123 o 2:f63b90038565@default(stable/draft) merge | 123 o 2:f63b90038565@default(/draft) merge |
| 124 |\ | 124 |\ |
| 125 | o 1:f15c744d48e8@default(stable/draft) addmore | 125 | o 1:f15c744d48e8@default(/draft) addmore |
| 126 | | 126 | |
| 127 o 0:07f494440405@default(stable/draft) adda | 127 o 0:07f494440405@default(/draft) adda |
| 128 | 128 |
| 129 $ hg bookmark -r 2 unrelated | 129 $ hg bookmark -r 2 unrelated |
| 130 $ hg bookmark touncommit-bm | 130 $ hg bookmark touncommit-bm |
| 131 $ hg bookmark --inactive touncommit-bm-inactive | 131 $ hg bookmark --inactive touncommit-bm-inactive |
| 132 $ hg bookmarks | 132 $ hg bookmarks |
| 216 d | 216 d |
| 217 d | 217 d |
| 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(/draft) touncommit |
| 222 | | 222 | |
| 223 | x 3:5eb72dbe0cb4@bar(extinct/draft) touncommit | 223 | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |
| 224 |/ | 224 |/ |
| 225 o 2:f63b90038565@default(stable/draft) merge | 225 o 2:f63b90038565@default(/draft) merge |
| 226 |\ | 226 |\ |
| 227 | o 1:f15c744d48e8@default(stable/draft) addmore | 227 | o 1:f15c744d48e8@default(/draft) addmore |
| 228 | | 228 | |
| 229 o 0:07f494440405@default(stable/draft) adda | 229 o 0:07f494440405@default(/draft) adda |
| 230 | 230 |
| 231 $ hg bookmarks | 231 $ hg bookmarks |
| 232 * touncommit-bm 4:e8db4aa611f6 | 232 * touncommit-bm 4:e8db4aa611f6 |
| 233 touncommit-bm-inactive 4:e8db4aa611f6 | 233 touncommit-bm-inactive 4:e8db4aa611f6 |
| 234 unrelated 2:f63b90038565 | 234 unrelated 2:f63b90038565 |
| 263 R f | 263 R f |
| 264 R g | 264 R g |
| 265 R m | 265 R m |
| 266 R n | 266 R n |
| 267 $ glog --hidden | 267 $ glog --hidden |
| 268 @ 5:c706fe2c12f8@bar(stable/draft) touncommit | 268 @ 5:c706fe2c12f8@bar(/draft) touncommit |
| 269 | | 269 | |
| 270 | o 4:e8db4aa611f6@bar(stable/draft) touncommit | 270 | o 4:e8db4aa611f6@bar(/draft) touncommit |
| 271 |/ | 271 |/ |
| 272 | x 3:5eb72dbe0cb4@bar(extinct/draft) touncommit | 272 | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |
| 273 |/ | 273 |/ |
| 274 o 2:f63b90038565@default(stable/draft) merge | 274 o 2:f63b90038565@default(/draft) merge |
| 275 |\ | 275 |\ |
| 276 | o 1:f15c744d48e8@default(stable/draft) addmore | 276 | o 1:f15c744d48e8@default(/draft) addmore |
| 277 | | 277 | |
| 278 o 0:07f494440405@default(stable/draft) adda | 278 o 0:07f494440405@default(/draft) adda |
| 279 | 279 |
| 280 $ hg debugobsolete | 280 $ hg debugobsolete |
| 281 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) | 281 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
| 282 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'user': 'test'} (glob) | 282 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'user': 'test'} (glob) |
| 283 | 283 |