| author | Patrick Mezard <patrick@mezard.eu> |
| Tue, 12 Jun 2012 11:14:02 +0200 | |
| changeset 263 | de62daaf2054 |
| child 265 | 24943df310d4 |
| permissions | -rw-r--r-- |
|
263
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
1 |
$ cat >> $HGRCPATH <<EOF |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
2 |
> [defaults] |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
3 |
> amend=-d "0 0" |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
4 |
> [extensions] |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
5 |
> hgext.rebase= |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
6 |
> hgext.graphlog= |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
7 |
> EOF |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
8 |
$ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
9 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
10 |
|
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
11 |
$ hg init repo |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
12 |
$ cd repo |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
13 |
$ echo a > a |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
14 |
$ hg ci -Am adda |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
15 |
adding a |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
16 |
|
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
17 |
Test amend captures branches |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
18 |
|
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
19 |
$ hg branch foo |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
20 |
marked working directory as branch foo |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
21 |
(branches are permanent and global, did you want a bookmark?) |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
22 |
$ hg amend |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
23 |
$ hg branch |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
24 |
foo |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
25 |
$ hg branches |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
26 |
foo 2:a34b93d251e4 |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
27 |
default 0:07f494440405 (inactive) |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
28 |
$ hg glog --template '{rev}@{branch} {desc|firstline}\n' |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
29 |
@ 2@foo adda |
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
30 |
|
|
de62daaf2054
amend: drop --branches, pick it from working directory
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
31 |