chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d33c40f) | patch
Stgit - gitmergeonefile.py: handle removal vs. changes
authorPaolo \'Blaisorblade\' Giarrusso <blaisorblade@yahoo.it>
Sun, 13 Nov 2005 19:42:25 +0000 (20:42 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Sat, 7 Jan 2006 11:13:06 +0000 (11:13 +0000)
commit1780280ce740fd36b032ef6fc42feb34d1dd272b
tree440484c5ad659a773b5a0e9fc554d6e51a72236btree | snapshot
parentd33c40f167af6610143c318c25880019ecbd0421commit | diff
Stgit - gitmergeonefile.py: handle removal vs. changes

I just got a "removal vs. changed" conflict, which is unhandled by StGit. That
is taken from git-merge-one-file resolver, but is bad, as stg resolved does not
handle unmerged entries (and probably it should be fixed too).

Sample patch included, but some thought must be done on it (see the comments I
left in).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
gitmergeonefile.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)