[prev in list] [next in list] [prev in thread] [next in thread] 

List:       svk-devel
Subject:    [svk-devel] Edit/addition of previous commit logs?
From:       stig () brautaset ! org (Stig Brautaset)
Date:       2006-12-26 8:55:20
Message-ID: 98BA3631-B156-4E26-BAB8-A533FD19B730 () brautaset ! org
[Download RAW message or body]

> I have the somewhat weird situation where svk has committed a change
> for me but without a commit log message (re-addition of a file during
> a 'svk up -sm' and resolving conflicts) and consequently the
> pre-commit check of the svn project that I'm trying to smerge back to
> barfs with an error.  What can I do?  Is it possible to go back and
> edit the log message for that change and then run 'svk smerge' again
> and it all to work?  (I expect it to be harder than this).
>
> *Any* help would be greatly appreciated.  I've got lots of commits
> pending (a long time without internet) and don't really want to go
> back and do all that work again (as well as doing a new checkout etc.
> etc.)

I expect this is a problem because you want to smerge iteratively.  
Try smerge iteratively _up to_ the problematic patch[0], merge that  
patch over manually with merge -c and a commit message, then smerge  
iteratively up to HEAD, something like this:

	svk smerge -I //local/foo@rXXX-1 //remote/foo
	svk merge -c XXX //local/foo //remote/foo
	svk smerge -I //local/foo //remote/foo

I hope that helps. Beware of off-by-one errors.

Stig

[prev in list] [next in list] [prev in thread] [next in thread]