equal
deleted
inserted
replaced
741 |
741 |
742 * abort: abort if the working directory is dirty |
742 * abort: abort if the working directory is dirty |
743 * none: don't check (merge working directory changes into destination) |
743 * none: don't check (merge working directory changes into destination) |
744 * linear: check that update is linear before merging working directory |
744 * linear: check that update is linear before merging working directory |
745 changes into destination |
745 changes into destination |
|
746 * noconflict: check that the update does not result in file merges |
746 |
747 |
747 This returns whether conflict is detected at updating or not. |
748 This returns whether conflict is detected at updating or not. |
748 """ |
749 """ |
749 if updatecheck is None: |
750 if updatecheck is None: |
750 updatecheck = ui.config('experimental', 'updatecheck') |
751 updatecheck = ui.config('experimental', 'updatecheck') |
751 if updatecheck not in ('abort', 'none', 'linear'): |
752 if updatecheck not in ('abort', 'none', 'linear', 'noconflict'): |
752 # If not configured, or invalid value configured |
753 # If not configured, or invalid value configured |
753 updatecheck = 'linear' |
754 updatecheck = 'linear' |
754 with repo.wlock(): |
755 with repo.wlock(): |
755 movemarkfrom = None |
756 movemarkfrom = None |
756 warndest = False |
757 warndest = False |