Show More
@@ -799,6 +799,12 b' class localrepository(repo.repository):' | |||||
799 | else: |
|
799 | else: | |
800 | changes = self.status(match=match) |
|
800 | changes = self.status(match=match) | |
801 |
|
801 | |||
|
802 | if (not (changes[0] or changes[1] or changes[2]) | |||
|
803 | and not force and p2 == nullid and | |||
|
804 | self[None].branch() == self['.'].branch()): | |||
|
805 | self.ui.status(_("nothing changed\n")) | |||
|
806 | return None | |||
|
807 | ||||
802 | ms = merge_.mergestate(self) |
|
808 | ms = merge_.mergestate(self) | |
803 | for f in changes[0]: |
|
809 | for f in changes[0]: | |
804 | if f in ms and ms[f] == 'u': |
|
810 | if f in ms and ms[f] == 'u': | |
@@ -844,13 +850,6 b' class localrepository(repo.repository):' | |||||
844 | m1 = self.manifest.read(c1[0]).copy() |
|
850 | m1 = self.manifest.read(c1[0]).copy() | |
845 | m2 = self.manifest.read(c2[0]) |
|
851 | m2 = self.manifest.read(c2[0]) | |
846 |
|
852 | |||
847 | if working: |
|
|||
848 | oldname = c1[5].get("branch") # stored in UTF-8 |
|
|||
849 | if (not commit and not remove and not force and p2 == nullid |
|
|||
850 | and branchname == oldname): |
|
|||
851 | self.ui.status(_("nothing changed\n")) |
|
|||
852 | return None |
|
|||
853 |
|
||||
854 | xp1 = hex(p1) |
|
853 | xp1 = hex(p1) | |
855 | if p2 == nullid: xp2 = '' |
|
854 | if p2 == nullid: xp2 = '' | |
856 | else: xp2 = hex(p2) |
|
855 | else: xp2 = hex(p2) |
General Comments 0
You need to be logged in to leave comments.
Login now