Christian Boos 62e4f8e6b2 rebase: make sure the newancestor is used during the whole update ... (issue1561) Before this change, newancestor was used only once as a replacement for ancestor.ancestor, but merge.update calls ancestor.ancestor several times, so it ends up with the "wrong" ancestor (the real ancestor, but we want the parent of the rebased changeset for all but the first rebased changeset). Added a new test case for this: test-rebase-newancestor. Also, in one scenario in test-rebase-collapse, there was a spurious conflict caused by the same issue, so that test case was fixed by removing the now unneeded conflict resolution and the output was adapted accordingly.		2009-11-09 20:15:49 +01:00
..
convert	kill trailing whitespace	2009-11-05 10:44:36 +01:00
highlight	Merge with crew-stable	2009-09-04 23:34:51 +02:00
inotify	Merge with crew-stable	2009-09-05 19:39:46 +02:00
zeroconf	Merge with crew-stable	2009-09-13 17:53:09 +02:00
__init__.py	Re-add hgext/__init__.py	2005-09-29 12:49:01 -07:00
acl.py	do not attempt to translate ui.debug output	2009-09-19 01:15:38 +02:00
bookmarks.py	bookmarks: use API to determine if repo is local	2009-10-25 12:05:07 +02:00
bugzilla.py	bugzilla: wrap docstrings at 70 characters	2009-07-26 01:39:47 +02:00
children.py	children: wrap docstrings at 70 characters	2009-07-26 01:40:37 +02:00
churn.py	churn: fix --progress (broken by 37a70f0b3ab8)	2009-10-30 15:43:01 +02:00
color.py	color: wrap qrecord	2009-11-05 01:11:28 +01:00
extdiff.py	Merge with -stable	2009-10-03 14:39:57 -05:00
fetch.py	Merge with crew-stable	2009-07-22 18:08:02 -05:00
gpg.py	do not translate commit messages	2009-07-22 22:50:34 +02:00
graphlog.py	graphlog: hide internal state of ascii() from users	2009-10-21 14:16:37 +02:00
hgcia.py	do not attempt to translate ui.debug output	2009-09-19 01:15:38 +02:00
hgk.py	do not attempt to translate ui.debug output	2009-09-19 01:15:38 +02:00
interhg.py	interhg: wrap docstrings at 70 characters	2009-07-26 01:49:30 +02:00
keyword.py	keyword: uppercase short option for kwfiles --all, like hg status -A	2009-10-01 00:00:18 +02:00
mq.py	mq: do not call ui.username unless it is necessary	2009-11-07 00:13:05 +01:00
notify.py	notify: permit suppression of merge changeset notification	2009-09-23 02:31:09 -05:00
pager.py	pager: wrap docstrings at 70 characters	2009-07-26 01:56:02 +02:00
parentrevspec.py	parentrevspec: wrap docstrings at 70 characters	2009-07-26 01:56:25 +02:00
patchbomb.py	patchbomb: accept default if it is empty string	2009-10-25 14:28:02 +01:00
purge.py	purge: wrap docstrings at 70 characters	2009-07-26 01:59:28 +02:00
rebase.py	rebase: make sure the newancestor is used during the whole update	2009-11-09 20:15:49 +01:00
record.py	record: use uisetup instead of extsetup to register qrecord	2009-11-05 01:10:43 +01:00
relink.py	relink: do not translate format string with no text	2009-11-08 00:11:34 +01:00
share.py	share: wrap docstrings at 70 characters	2009-07-26 02:01:19 +02:00
transplant.py	Merge with crew-stable	2009-09-10 10:31:12 +02:00
win32mbcs.py	win32mbcs: util.normpath should be wrapped.	2009-09-18 21:25:47 +09:00
win32text.py	win32text: use reST syntax for literal blocks	2009-07-23 00:26:26 +02:00