~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 608961c) | patch
Test that pulls a patch creating a file that got modified afterwards
authorYann Dirson <ydirson@altern.org>
Sun, 16 Apr 2006 20:40:29 +0000 (22:40 +0200)
committerCatalin Marinas <catalin.marinas@gmail.com>
Tue, 2 May 2006 20:35:14 +0000 (21:35 +0100)
commit8c8be628038f425c90c2101e362bf77f9a8bd948
tree9201f4c50602a36f6eb88eb9b1d0f0e6840382fftree | snapshot (tar.gz zip)
parent608961c24ee007e7a19db6be020f3be0d8155511commit | diff
Test that pulls a patch creating a file that got modified afterwards

This demonstrates an issue wite has bitten me more than once: the stg
branch adds a file in one patch, and modifies it in a later patch; then all
patches get integrated in upstream tree, and at "stg pull" time, stgit
believes there is a conflict, even when the patches are exactly the same.

This is normal as it requires the --merged flag on push or pull.  So
we rollback with "push --undo" and "push --merge" to finish.
t/t1200-push-modified.sh [new file with mode: 0755] blob
GIT patch-maintenance porcelain (local modifications)