view tests/test-grep.out @ 2021:fc22ed56afe3

Fix hg push and hg push -r sometimes creating new heads without --force. Fixing issue179. The algorithm checks if there not more new heads on the remote side than heads which become non-heads due to getting children. Pushing this repo: m /\ 3 3a| |/ / 2 2a |/ 1 to a repo only having 1, 2 and 3 didn't abort requiring --force before. Added test cases for this and some doc strings for used methods.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 29 Mar 2006 22:35:21 +0200
parents fad2d091c74f
children 81f351c5264d
line wrap: on
line source

port:4:export
port:4:vaportight
port:4:import/export
FIXME: history is wrong here
port:1:1:-:eggs:import
port:1:2:+:eggs:vaportight
port:1:3:+:eggs:import/export
port:0:2:+:spam:export
port:0:1:+:spam:import
port:4:import/export