7 Commits

Author	SHA1	Message	Date
Mads Kiilerich	4f14a0a969	tests: convert some 'hghave execbit' to #if ... This enables some new tests for running on windows.	2012-06-10 14:14:05 +02:00
David Soria Parra	7d0d5a5a60	merge: respect bookmarks during merge ... Bookmarks will behave more like named branches when merge tries to pick a revision to merge. Bookmarks now to respect the current bookmarks. Bookmarks will not accidentally merged with unnamed heads or other bookmarks. However merge can pick heads with diverging bookmarks and pick those automatically. We end up with two cases for picking a revision to merge: (1) In case of an current bookmark, merge can pick a branch head that has a diverged bookmark (2) In case of no current bookmark, merge can pick a branch head that does not have a bookmark.	2012-05-13 11:55:42 +02:00
Mads Kiilerich	adfff587c7	tests: use 'hghave execbit' for tests that manipulate x bit in file system	2011-11-07 03:14:54 +01:00
Patrick Mezard	e29463618b	merge with stable	2011-04-20 23:30:07 +02:00
Patrick Mezard	95e7147cd4	convert: make filemap prune useless branch closing revs (issue2774) ... A branch closing revision only applies if one of its parents belongs to the branch being closed. Otherwise the filemap can prune it too.	2011-04-20 23:15:18 +02:00
Edouard Gomez	a8dbc160c7	convert: add hg source bookmark test	2011-04-04 00:05:41 +02:00
Matt Mackall	2066e73671	tests: unify test-convert-hg-source	2010-09-26 16:48:57 -05:00