equal
deleted
inserted
replaced
1978 # trigger a transaction so that we are guaranteed to have the lock now. |
1978 # trigger a transaction so that we are guaranteed to have the lock now. |
1979 if op.ui.configbool('experimental', 'bundle2lazylocking'): |
1979 if op.ui.configbool('experimental', 'bundle2lazylocking'): |
1980 op.gettransaction() |
1980 op.gettransaction() |
1981 |
1981 |
1982 currentheads = set() |
1982 currentheads = set() |
1983 for ls in op.repo.branchmap().itervalues(): |
1983 for ls in op.repo.branchmap().iterheads(): |
1984 currentheads.update(ls) |
1984 currentheads.update(ls) |
1985 |
1985 |
1986 for h in heads: |
1986 for h in heads: |
1987 if h not in currentheads: |
1987 if h not in currentheads: |
1988 raise error.PushRaced('remote repository changed while pushing - ' |
1988 raise error.PushRaced('remote repository changed while pushing - ' |