##// END OF EJS Templates
merge: exit early during a no-op update (BC)...
Siddharth Agarwal -
r19929:ab2362e1 default
parent child Browse files
Show More
@@ -719,6 +719,12 b' def update(repo, node, branchmerge, forc'
719 "subrepository '%s'") % s)
719 "subrepository '%s'") % s)
720
720
721 elif not overwrite:
721 elif not overwrite:
722 if p1 == p2: # no-op update
723 # call the hooks and exit early
724 repo.hook('preupdate', throw=True, parent1=xp2, parent2='')
725 repo.hook('update', parent1=xp2, parent2='', error=0)
726 return 0, 0, 0, 0
727
722 if pa not in (p1, p2): # nolinear
728 if pa not in (p1, p2): # nolinear
723 dirty = wc.dirty(missing=True)
729 dirty = wc.dirty(missing=True)
724 if dirty or onode is None:
730 if dirty or onode is None:
@@ -42,8 +42,6 b' Poke at a clone:'
42 0 files, 0 changesets, 0 total revisions
42 0 files, 0 changesets, 0 total revisions
43 $ ls .hg
43 $ ls .hg
44 00changelog.i
44 00changelog.i
45 branch
46 dirstate
47 hgrc
45 hgrc
48 requires
46 requires
49 store
47 store
@@ -243,6 +243,7 b' qpush --exact --force with changes to a '
243 +cp1
243 +cp1
244 $ hg qpop -aqf
244 $ hg qpop -aqf
245 patch queue now empty
245 patch queue now empty
246 $ hg forget fp1
246 $ rm fp1
247 $ rm fp1
247 $ rm fp1.rej
248 $ rm fp1.rej
248
249
General Comments 0
You need to be logged in to leave comments. Login now