[issue665] hg backout should warn if used on a changeset from a different branch

Thomas Arendsen Hein mercurial-bugs at selenic.com
Thu Aug 2 04:49:32 CDT 2007


New submission from Thomas Arendsen Hein <thomas at intevation.de>:

$ hg clone http://hg.atheme.org/audacious/ audacious-devel
requesting all changes
adding changesets
adding manifests
adding file changes
added 3217 changesets with 14112 changes to 3196 files
516 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd audacious-devel/
$ ls src/audacious/ | grep playlist_slider
$ hg backout f7f26ab3b473
reverting src/audacious/main.c
changeset 3217:121ed7079eff backs out changeset 3216:f7f26ab3b473
the backout changeset is a new head - do not forget to merge
(use "backout --merge" if you want to auto-merge)
$ hg merge
abort: there is nothing to merge - use "hg update" instead
$ hg update
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branches
trunk                          3216:f7f26ab3b473
default                        3111:511c1301b7c3 (inactive)

----------
messages: 3671
nosy: ThomasAH
priority: bug
status: unread
title: hg backout should warn if used on a changeset from a different branch
topic: release, ui

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue665>
____________________________________________________



More information about the Mercurial-devel mailing list