annotate tests/test-revlog-group-emptyiter.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 f2719b387380
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12328
diff changeset
1 Issue1678: IndexError when pushing
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 11918
diff changeset
2
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
3 setting up base repo
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
4 $ hg init a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
5 $ cd a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
6 $ touch a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
7 $ hg ci -Am a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
8 adding a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
9 $ cd ..
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
10
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
11 cloning base repo
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
12 $ hg clone a b
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
13 updating to branch default
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
15 $ cd b
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
16
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
17 setting up cset to push
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
18 $ hg up null
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
19 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
20 $ touch a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
21 different msg so we get a clog new entry
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
22 $ hg ci -Am b
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
23 adding a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
24 created new head
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
25
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
26 pushing
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
27 $ hg push -f ../a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
28 pushing to ../a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
29 searching for changes
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
30 adding changesets
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
31 adding manifests
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
32 adding file changes
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
33 added 1 changesets with 0 changes to 0 files (+1 heads)
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
34
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
35 $ cd ..