Mercurial > hg
view tests/test-notify-changegroup.t @ 12727:52971985be14
backout: provide linear backout as a default (without --merge option)
This changes backouts changeset to retain linear history, .e. it is committed
as a child of the working directory parent, not the reverted changeset
parent.
The default behavior was previously to just commit a reverted change as a
child of the backed out changeset - thus creating a new head. Most of
the time, you would use the --merge option, as it does not make sense to
keep this dangling head as is.
The previous behavior could be obtained by using 'hg update --clean .' after a
'hg backout --merge'.
The --merge option itself is not affected by this change. There is also
still an autocommit of the backout if a merge is not needed, i.e. in case
the backout is the parent of the working directory.
Previously we had (pwd = parent of the working directory):
pwd older
backout auto merge
backout --merge auto commit
With the new linear approach:
pwd older
backout auto commit
backout --merge auto commit
auto: commit done by the backout command
merge: backout also already committed but explicit merge and commit needed
commit: user need to commit the update/merge
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Fri, 10 Sep 2010 10:28:18 +0200 |
parents | 6cc4b14fb76b |
children | cdd6ecfd3bcd |
line wrap: on
line source
$ cat <<EOF >> $HGRCPATH > [extensions] > notify= > > [hooks] > changegroup.notify = python:hgext.notify.hook > > [notify] > sources = push > diffstat = False > maxsubject = 10 > > [usersubs] > foo@bar = * > > [reposubs] > * = baz > EOF $ hg init a clone $ hg --traceback clone a b updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a > b/a commit $ hg --traceback --cwd b commit -Ama adding a $ echo a >> b/a commit $ hg --traceback --cwd b commit -Amb push $ hg --traceback --cwd b push ../a 2>&1 | > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' pushing to ../a searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Date: * (glob) Subject: * (glob) From: test X-Hg-Notification: changeset cb9a9f314b8b Message-Id: <*> (glob) To: baz, foo@bar changeset cb9a9f314b8b in $TESTTMP/a details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b summary: a changeset ba677d0156c1 in $TESTTMP/a details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1 summary: b diffs (6 lines): diff -r 000000000000 -r ba677d0156c1 a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,2 @@ +a +a