i thought this was a limitation of svn itself?
I really find this the most annoying missing thing of svn if i can say that.
for example the simple thing like:
i change a file, and then an update comes in that did move the file,
This should just work, the file should be moved and then updated (and
if then there are line number conflicts then a merge conflict should
happen but not before that)
Or the other way around, if i move a file and then an update comes
around from another that also has updated the file, it should just
update it on the new position.
And this is just purely on 1 trunk/branch just updating.
Besides that we have merges that should be done on the files that
another branch already moved, svn knows this information already so it
should just be able to do an "update" (merge) even if they are now on
different locations.
I really hope that SVN1.7 (and subclipse), when it will come out, its
already late according to there own roadmap, will fix these things
else i think we will look to GIT again.
Moving files around is just a normal day to day thing
johan
On Sun, Apr 24, 2011 at 10:15, AcidShAwk <acidshawk_at_gmail.com> wrote:
> I found a solution..
>
> smartSVN
>
> http://www.syntevo.com/smartsvn/index.html
>
> it has something called xMerge which allows merging from renamed / moved
> branches..
>
> its a 30 day trial.. which actually for us is enough that we'll have any
> past revisions available to be merged in as needed.. but the program seems
> worthwhile enough to buy perhaps.
>
> J
>
>
>
> Bruno Velly wrote:
>>
>> I guess I tried all possible methods for merging but nothing to do !!!
>>
>> ------------------------------------------------------
>> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2722774
>>
>> To unsubscribe from this discussion, e-mail:
>> [users-unsubscribe_at_subclipse.tigris.org].
>>
>>
>
> --
> View this message in context: http://old.nabble.com/Merge-lost-revisions-tp31448675p31464844.html
> Sent from the subclipse - users mailing list archive at Nabble.com.
>
> ------------------------------------------------------
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2723820
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
>
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2723838
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2011-04-24 12:43:53 CEST