[issue1301] Rebasing multiple changes requires redundant merges

Benjamin Smedberg mercurial-bugs at selenic.com
Tue Sep 16 08:46:52 CDT 2008


New submission from Benjamin Smedberg <benjamin at smedbergs.us>:

I frequently want to rebase a branch of multiple patches forward. This works
well if there are no conflicts. But if there are conflicts in the first rebased
change, all the subsequent rebasings require me to resolve the same conflict
over and over again, even if the subsequent changes don't touch the conflicting
file at all.

The same kind of workflow with hg qpush -m doesn't have this problem.

Testcase .sh script attached

----------
messages: 7149
nosy: bsmedberg
priority: bug
status: unread
title: Rebasing multiple changes requires redundant merges

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



More information about the Mercurial-devel mailing list