branch Copying Specific Changes

SteffenNetz
SteffenNetz
Hi,    I dont get the example in the SVN-Book "Copying Specific Changes" to work.  I've done the following:    >svn co file:///$SVN_ROOT/InMuSens/tags/test  >svn co file:///$SVN_ROOT/InMuSens/trunk    >cd trunk/working  .. Editing main.c  >svn commit -m "Test fuer SVN_Branching" main.c  Sending main.c  Transmitting file data .  Committed revision 171.  >cd ../../test/working  .. Editing main.c  >svn commit -m "test SVN-BRanch aus Branch" main.c  Sending main.c  Transmitting file data .  Committed revision 172.    That was my work.  Now in the Main-Trunk should reside the version 171, and  in the test-branch the revision 172.    Now does'nt work the access on the other commit:    from test:  svn diff -r 171:172  Index: main.c  ===================================================================  --- main.c (revision 171)  +++ main.c (revision 172)  @@ -20,6 +20,7 @@   #include "i2c.h"   #include "notch_filter.h"    +// Ich bin im Branch, Test fuer SVN     data_t log[LOG_ANZ];   data_t log_anz;    Here is the change from Main-trunk missing    from main trunk  >svn diff -r 171:172   --> nothing    Can you help me, please    Steffen

Last updated

Mahesh
Mahesh
Re: branch Copying Specific Changes    Shouldn't on the main trunk be:      >svn diff -r 170:171  
SteffenNetz
SteffenNetz
Why,    I want to diff/merge the versions on the branch(172) and the main-trunk(171).    170 --main-- 171   +-test -- 172    How does it work?    In the test-branch the svn diff -r171:172 gives   diff from 170 to 172  In the main   nothing.    What is the point. Am I silly :?    thanks,    Steffen[/quote]
Mahesh
Mahesh
Hello Steffen    I think I got confused, can you please iterate what you need to do?    Mahesh    
SteffenNetzWhy,    I want to diff/merge the versions on the branch(172) and the main-trunk(171).    170 --main-- 171   +-test -- 172    How does it work?    In the test-branch the svn diff -r171:172 gives   diff from 170 to 172  In the main   nothing.    What is the point. Am I silly :?    thanks,    Steffen[/quote]

1-4 of 4

Reply to this discussion

You cannot edit posts or make replies: You should be logged in before you can post.