Hi Max,
Maximilian Odendahl wrote:
> Hi,
>
>> SVN 1.5.4 is OK.
>
> so any idea why new files were not added during rebase?
>
> -Max
>
I think we finally found out why the new files were not added during
rebase, many thanks to Mathias Bauer who pointed this out to me.
The one way to cause this to happen is the following:
1) Try an rebase ("cws rebase -m"), this failed or was interrupted for
one reason or another
2) Do an "svn revert -R ." to get rid of all the already merged stuff.
3) Do "cws rebase -m" again, worked this time.
4) Do a "cws rebase -C"
and
suddenly you realize that many new files were not added during rebase.
What went wrong?
If you do a "svn status" after doing the revert (step 2) you'll notice a
number of files marked with an "?", untracked files. Every *new* file
which has been merged up to the breakage in 1) will be among them. This
is because "svn" marks them only as "untracked" and does not delete them
in the revert, this is because it can't know where they did come from in
the first place - it could be manually crafted files from the developer
which she/he just had added, or it could come from a merge with
subsequent "add". In the former case deleting the file could have
serious consequences and cause unhappy faces.
SVN goes the safe way here and doesn't delete the files. If you do now a
new merge nothing will happen to these files - after all they are
already in you working tree ...
I guess you can see where this is going ...
So the moral of the story:
- if you do a revert, than do it right.
- never ever merge into an unclean working tree.
cd <workspace>
svn revert -R .
svn-clean
svn status <- to make sure that your tree is really clean
svn-clean is a script which will delete all untracked files (object
files included) in your working tree. It comes with your SVN distribution.
Does this sequence of events match your experience?
Heiner
--
Jens-Heiner Rechtien
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
