equal
deleted
inserted
replaced
144 | note: folding changesets using metaedit |
144 | note: folding changesets using metaedit |
145 | |
145 | |
146 x 587528abfffe (7) F |
146 x 587528abfffe (7) F |
147 rewritten(user) as 212b2a2b87cd using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
147 rewritten(user) as 212b2a2b87cd using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
148 |
148 |
|
149 $ hg debugobsolete --rev . --exclusive |
|
150 212b2a2b87cdbae992f001e9baba64db389fbce7 a08d35fd7d9d0f8cb33d5bd2074e9bafb5cbc70f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '29', 'fold-id': 'c5832a81', 'fold-idx': '2', 'fold-size': '2', 'note': 'folding changesets using metaedit', 'operation': 'metaedit', 'user': 'test'} |
|
151 c2bd843aa2468b30bb56d69d4f5fef95b85986f2 a08d35fd7d9d0f8cb33d5bd2074e9bafb5cbc70f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'fold-id': 'c5832a81', 'fold-idx': '1', 'fold-size': '2', 'note': 'folding changesets using metaedit', 'operation': 'metaedit', 'user': 'test'} |
149 |
152 |
150 no new commit is created here because the date is the same |
153 no new commit is created here because the date is the same |
151 $ HGEDITOR=cat hg metaedit |
154 $ HGEDITOR=cat hg metaedit |
152 E |
155 E |
153 |
156 |
203 'fold' one commit |
206 'fold' one commit |
204 $ HGUSER=foobar3 hg metaedit "desc(D2)" --fold -U |
207 $ HGUSER=foobar3 hg metaedit "desc(D2)" --fold -U |
205 1 changesets folded |
208 1 changesets folded |
206 $ hg log -r "tip" --template '{rev}: {author}\n' |
209 $ hg log -r "tip" --template '{rev}: {author}\n' |
207 12: foobar3 |
210 12: foobar3 |
|
211 $ hg debugobsolete --rev 'tip' --exclusive |
|
212 f3d001339afd30d27fcd91e713274a78233528c8 07a6525ddaf5de1ab33352806abb5724a0954f3f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '16', 'operation': 'metaedit', 'user': 'foobar3'} |
208 |
213 |
209 working on merge commits too |
214 working on merge commits too |
210 |
215 |
211 $ hg up -q 11 |
216 $ hg up -q 11 |
212 $ hg merge -q 12 |
217 $ hg merge -q 12 |