5 Commits

Author	SHA1	Message	Date
Adrian Buehlmann	153675561e	clone: print "updating working directory" status message ... With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved	2008-03-21 14:52:24 +01:00
Matt Mackall	6bf7f7256d	merge: fix spurious merges for copies in linear updates ... We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.	2007-05-08 02:59:13 -05:00
Matt Mackall	ebc2b5ccc8	merge: fix a bug where copies were ignored	2007-04-05 16:43:18 -05:00
Matt Mackall	f9f3aa2d91	avoid unnecessary copy merges	2006-11-18 11:34:19 -06:00
Thomas Arendsen Hein	ccb1957113	Test for 1de7d8df2123 (update dirstate correctly for non-branchmerge updates) ... (Test case created by Johannes Hofmann)	2006-10-14 10:53:29 +02:00