On Friday 01 July 2011, Rui Gonçalves wrote:
Like I said before, I'm currently using the subclise plugin to manage
all the svn interaction with the repository.
As far as I know, I'm able to select the revisions which I want to
apply but I'm not sure about the following aspect:
- on revision 10, aaa.php has some changes
- on revision 15, aaa.php has other changes
This is perfectly normal, sometimes a file is changed multiple times for a
single feature. In order to merge the feature branch back into trunk, you just
merge those changes, either in a single step or one after the other.
Once on subclipse is not handy to select latest revision of a certain
file (15, considering my example), is there any way to obtain that
information.
The first part of this sentence doesn't make sense to me, it looks like broken
English. Concerning how to get at the 15, you can just go through each file in
your branch and check when they were last changed using svn log, but that is
unnecessarily complicated. Just look at the log of the branch as a whole in
order to decide which changes to merge.
BTW: I have the feeling as if you wanted to replace the version of a file in
trunk with the version in the branch. This of course can be done, just use
svn copy, but it is a bad approach to branching and merging. The reason is
that if trunk was changed, the changes there are effectively discarded.
Still, I'm not really sure I understand what you are trying to achieve.
Really, giving an example would help, all with what you have, what you do, and
what you expect to have afterwards. This still isn't clear.
Good luck!
Uli
**
Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**
Visit our website at http://www.dominolaser.com
**
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten
bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen
Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein
sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen,
weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte
Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht
verantwortlich.
**
