Mercurial > hgsubversion
comparison tests/fixtures/mergeexternals.svndump @ 1036:e775ffbcb359
push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS
Subversion differentiates adding an already-added file from
transaction being out of date and edit conflicts. Fixes #400.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Tue, 16 Jul 2013 10:09:55 -0400 |
parents | ba65c0b01d4f |
children |
comparison
equal
deleted
inserted
replaced
1035:2c64453f98a7 | 1036:e775ffbcb359 |
---|