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

List:       subversion-dev
Subject:    Minor problem with 'merge' output for added files.
From:       Vladimir Prus <ghost () cs ! msu ! su>
Date:       2002-04-15 14:41:42
[Download RAW message or body]


If a file is added on two different branches, and I merge from one branch to 
another, that file is shown is added

    A  ./file

 although it is actually conflict. This looks like a bug, although very 
minor, to me. It should be easy to fix, but at the moment I don't have the 
time -- probably somebody just knows what place to change and can fix it in 
one minute.

- Volodya

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