equal
deleted
inserted
replaced
2 $ cat >> $HGRCPATH <<EOF |
2 $ cat >> $HGRCPATH <<EOF |
3 > [ui] |
3 > [ui] |
4 > logtemplate={rev}:{node|short} {desc}\n |
4 > logtemplate={rev}:{node|short} {desc}\n |
5 > [defaults] |
5 > [defaults] |
6 > amend=-d "0 0" |
6 > amend=-d "0 0" |
|
7 > [alias] |
|
8 > glog = log -GT "{rev}: {desc}" |
7 > [extensions] |
9 > [extensions] |
8 > hgext.rebase= |
10 > hgext.rebase= |
9 > EOF |
11 > EOF |
10 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
12 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
11 |
13 |
168 $ hg touch 2 |
170 $ hg touch 2 |
169 abort: cannot touch public changesets: * (glob) |
171 abort: cannot touch public changesets: * (glob) |
170 (see 'hg help phases' for details) |
172 (see 'hg help phases' for details) |
171 [255] |
173 [255] |
172 $ hg touch --duplicate 2 |
174 $ hg touch --duplicate 2 |
|
175 |
|
176 Reviving merge commit |
|
177 |
|
178 $ hg up 12 |
|
179 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
180 $ hg merge 15 |
|
181 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
182 (branch merge, don't forget to commit) |
|
183 $ hg ci -m merge |
|
184 $ hg prune -r . |
|
185 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
186 working directory is now at * (glob) |
|
187 1 changesets pruned |
|
188 $ hg touch 16 --hidden |
|
189 abort: cannot amend merge changesets |
|
190 [255] |