Mercurial > hg
annotate tests/test-extra-filelog-entry.t @ 26228:0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
One of the things I missed the most when transitioning from versioned MQ to
evolve was the loss of being able to check that rebase conflicts were properly
resolved by:
$ hg ci --mq -m "before"
$ hg rebase -s qbase -d tip
$ hg bcompare --mq
The old csets stay in the tree with evolve, but a straight diff includes all of
the other changes that were pulled in, obscuring the code that was rebased.
Diffing deltas can be confusing, but unless radical changes were made during the
resolve, it is very clear when individual hunks are added, dropped or modified.
Unlike the MQ technique, this can only compare a single pair of csets/patches at
a time. Like the MQ method, this also highlights changes in the commit comment
and other metadata.
I originally tried monkey patching from the evolve extension, but that is too
complicated given that it depends on the order the two different extensions are
loaded. This functionality is also useful when comparing grafts however, so
implementing it in the core is more than just convenience.
The --change argument doesn't make much sense for this, but it isn't harmful so
I didn't bother blocking it. The -I/-X options are ignored because of a
limitation of cmdutil.export(). We'll fix that next.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 09 Sep 2015 21:07:38 -0400 |
parents | b87acfda5268 |
children | 009d0283de5f |
rev | line source |
---|---|
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12328
diff
changeset
|
1 Issue351: mq: qrefresh can create extra revlog entry |
4531
b51a8138292a
Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
12305
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
3 $ echo "[extensions]" >> $HGRCPATH |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
4 $ echo "mq=" >> $HGRCPATH |
4531
b51a8138292a
Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
12305
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
6 $ hg init |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
7 $ hg qinit |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
8 |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
9 $ echo b > b |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
10 $ hg ci -A -m foo |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
11 adding b |
4531
b51a8138292a
Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 |
12305
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
13 $ echo cc > b |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
14 $ hg qnew -f foo.diff |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
15 $ echo b > b |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
16 $ hg qrefresh |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
17 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12399
diff
changeset
|
18 $ hg debugindex b |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14182
diff
changeset
|
19 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14182
diff
changeset
|
20 0 0 3 ..... 0 1e88685f5dde 000000000000 000000000000 (re) |
12305
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
21 |