Re: svn diff of working copy file to unrelated branch file
On Thu, Jun 28, 2012 at 10:59 PM, wrote: > > Here is the scenario: > > User 1 > 1. create branches/X > 2. svn checkout branches/X to local machine > 3. modify file.txt > 4. commit changes > > > Another user, User 2, > 5. create branches/Y > 6. svn checkout branches/Y to his local machine > 7. merge branches/X to local machine (and thus merges file.txt into > branches/Y) > 8. use svn diff to verify that the changes to file.txt in the local copy > of branches/Y succeeded before committing the change. > > > Since svn diff can not compare the local working copy to that of a URL, this > is impossible to do without first committing the change to branches/Y. I don't understand. If you want to see what has changed, after the merge, to file.txt in your working copy of branches/Y, 'svn diff file.txt' should do the trick, no? -- Johan
Re: Subversion Exception!
On Thu, Jun 28, 2012 at 10:37 PM, 280602 wrote: > Hi, > > I just got this error, the program asking me to send ask directly to the > mailing list: It also asked you to described what you were doing when the exception occurred. > --- > Subversion Exception! > --- > Subversion encountered a serious problem. > Please take the time to report this on the Subversion mailing list > with as much information as possible about what > you were trying to do. > But please first search the mailing list archives for the error message > to avoid reporting the same problem repeatedly. > You can find the mailing list archives at > http://subversion.apache.org/mailing-lists.html > > Subversion reported the following > (you can copy the content of this dialog > to the clipboard using Ctrl-C): > > In file > 'D:\Development\SVN\Releases\TortoiseSVN-1.7.1\ext\subversion\subversion\libsvn_wc\update_editor.c' > line 1582: assertion failed (action == svn_wc_conflict_action_edit || > action > == svn_wc_conflict_action_delete || action == > svn_wc_conflict_action_replace) > --- > OK > --- > > and in the TortoiseSVN windows: > Command: Update > Updating: D:\Svn\tetuo > Error: In file > Error: > 'D:\Development\SVN\Releases\TortoiseSVN-1.7.1\ext\subversion\subversion\libsvn_wc\update_editor.c' > Error: line 1582: assertion failed (action == svn_wc_conflict_action_edit > || action > Error: == svn_wc_conflict_action_delete || action == > svn_wc_conflict_action_replace) > Completed!: > > Can I get a help answer directly here or should I read it somewhere else? First you should upgrade to the curent release of TortoiseSVN (1.7.7). 1.7.1 is pretty old (reports of this error go back to September) and a LOT of bug fixes have been made since it was released.
Re: svn diff of working copy file to unrelated branch file
[ Replying back to the users@ list. Please use 'reply all' to keep the discussion on the list. Also, if possible, please use plain text emails, and do not top post (i.e. put your reply at the bottom of the thing you're replying to, or inline). More below ... ] > On Thu, Jun 28, 2012 at 10:59 PM, wrote: > > > > Here is the scenario: > > > > User 1 > >1. create branches/X > >2. svn checkout branches/X to local machine > >3. modify file.txt > >4. commit changes > > > > > > Another user, User 2, > >5. create branches/Y > >6. svn checkout branches/Y to his local machine > >7. merge branches/X to local machine(and thus merges file.txt > > into branches/Y) > >8. use svn diff to verify that the changes to file.txt in the local > > copy of branches/Y succeeded before committing the change. > > > > > > Since svn diff can not compare the local working copy to that of a URL, > > this is impossible to do without first committing the change to branches/Y. > > I don't understand. If you want to see what has changed, after the > merge, to file.txt in your working copy of branches/Y, 'svn diff > file.txt' should do the trick, no? > On Fri, Jun 29, 2012 at 3:43 PM, wrote: > > Yes, of course, svn diff shows me the changes that have been merged in to > my local working copy. > But that is not what my question is asking. > > I want to compare two versions of file.txt. > The one in branches/X and the one in my working copy. > svn diff does not allow me to compare a path and a url. > So, I can not do the following: > > /branches/Y>svn diff file.txt http://repository/branches/X/file.txt > > So I have no way of verifying if the changes merged in to my local working > copy are correct. > > There are lots of work arounds like: > 1. check out branches/X to my drive and then compare two paths > 2. commit the changes to my working copy and then compare two urls > > Neither of these are reasonable solutions. I think this should work: svn diff --old=http://repository/branches/X/file.txt --new=file.txt (i.e. the 2nd usage if you look at 'svn help diff') -- Johan
bug in "Undoing Changes" functionality of merge -c -N?
Hi. I am running Subversion version 1.6.4 on a rhel5 system. Unfortunately, I don't have admin access to my machine (it's a box in an academic department), but colleagues have reproduced this behavior on newer versions of Subversion. The bug question I have is also posted at the following link, if it's easier to read in that format: http://stackoverflow.com/questions/11195483/conflict-when-attempting-undoing-changes-example-in-subversion I was checking out Subversion functionality by attempting to recreate the scenario given in the svnbook in the Branching and Merging chapter, in the subsection "Undoing Changes", part of the Basic Merging section ( http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.branchmerge.basicmerging.undo). As I read it, that subsection claims that changes committed in the past can be undone, leaving subsequent good commits unaffected, by running svn merge -c -rN file:///path_to_repos/trunk where rN is the resulting revision number of the commit that contained errors to be removed. In order to follow the example, in my working copy directory, I edited a file testcode.py, adding one line per edit, and committing after each edit. After several commits, the file read as follows: this is my first import to trunk. r1. this is my first commit, first edit of testcode.py. r2. this is another edit of testcode.py. r3. this is an edit of testcode.py. i'll get rid of this one. r4. this is another edit of testcode.py. keeping it. r5. yet another edit. keeping it. r6. - The revision numbers in the repository match up to the lines in the file such that in /trunk/testcode.py@rN, the last line of the file is the one ending with rN. What I want to do is remove the line ending in r4, keeping everything else before and after unchanged. Following the example in the Undoing Changes section of the svnbook, I run the command svn merge -c -4 file:///path_to_repos/trunk This creates a conflict (upon running that command, not on commit), whereby the merge-left file contains everything up until line r4, and the merge-right file contains everything up until line r3. In other words, instead of removing a past change, the command seems to want to revert the entire file back to either revision 3 or 4, removing changes in subsequent revisions (5 and 6, in this case). This appears not to be the way the merge command should behave, in this case seeing as the Undoing Changes section of the svnbook has the hypothetical user removing a commit from revision 303 with no conflict in the merge -c command, and committing to revision 350. If that example holds, the command I ran should have produced a file with the line ending in r4 removed and everything else unchanged. This appears to be a bug, but if not, I'd appreciate some advice as to what I'm doing incorrectly. Thanks. Nairn
Re: svn diff of working copy file to unrelated branch file
Sorry, this is the e-mail client we have here at work. I'm not a fan of it, but its what we have to use. I want to thank you for solving the problem. The svn diff syntax you provided works exactly as expected. I would suggest adding this to the online subversion manual at http://svnbook.red-bean.com/en/1.7/index.html. "At this point, the wise thing to do is look at the changes carefully with svn diff, and then build and test your branch." It would be useful to mention the syntax of the svn diff command here so that user's can see exactly how to do it. I think it would save a lot of developers time. Thank you very much. for your help. I had spent an entire day trying to figure it out. Now it seems so easy once you showed me. Thank you. Joneric Wennerstrom / Sr Programmer/Anlyst-Specialized Systems / Engineering & Factory Systems Support MS 188-400, 221 3rd Ave SE , Cedar Rapids, IA, 52401, USA Phone: 319-263-4597 / Fax: 319-263-6067 jwenn...@rockwellcollins.com www.rockwellcollins.com From: Johan Corveleyn To: jwenn...@rockwellcollins.com Cc: users@subversion.apache.org Date: 06/29/2012 09:14 AM Subject:Re: svn diff of working copy file to unrelated branch file [ Replying back to the users@ list. Please use 'reply all' to keep the discussion on the list. Also, if possible, please use plain text emails, and do not top post (i.e. put your reply at the bottom of the thing you're replying to, or inline). More below ... ] > On Thu, Jun 28, 2012 at 10:59 PM, wrote: > > > > Here is the scenario: > > > > User 1 > >1. create branches/X > >2. svn checkout branches/X to local machine > >3. modify file.txt > >4. commit changes > > > > > > Another user, User 2, > >5. create branches/Y > >6. svn checkout branches/Y to his local machine > >7. merge branches/X to local machine(and thus merges file.txt > > into branches/Y) > >8. use svn diff to verify that the changes to file.txt in the local > > copy of branches/Y succeeded before committing the change. > > > > > > Since svn diff can not compare the local working copy to that of a URL, > > this is impossible to do without first committing the change to branches/Y. > > I don't understand. If you want to see what has changed, after the > merge, to file.txt in your working copy of branches/Y, 'svn diff > file.txt' should do the trick, no? > On Fri, Jun 29, 2012 at 3:43 PM, wrote: > > Yes, of course, svn diff shows me the changes that have been merged in to > my local working copy. > But that is not what my question is asking. > > I want to compare two versions of file.txt. > The one in branches/X and the one in my working copy. > svn diff does not allow me to compare a path and a url. > So, I can not do the following: > > /branches/Y>svn difffile.txt http://repository/branches/X/file.txt > > So I have no way of verifying if the changes merged in to my local working > copy are correct. > > There are lots of work arounds like: > 1. check out branches/X to my drive and then compare two paths > 2. commit the changes to my working copy and then compare two urls > > Neither of these are reasonable solutions. I think this should work: svn diff --old=http://repository/branches/X/file.txt --new=file.txt (i.e. the 2nd usage if you look at 'svn help diff') -- Johan <>
Issue #2243 still exists with svn 1.6.17
Hey, We use libsvn in our project and have hit an issue [0] which appears to be a recurrence of libsvn bug #2243 [1]. Essentially we invoke 'svn_client_add3' and pass false for no_ignore but files in the ignore list are still added to the repository. Invoking "svn add thatfile" from the commandline results in the file being added too. Alan [0] https://bugzilla.xamarin.com/show_bug.cgi?id=5069 [1] http://subversion.tigris.org/issues/show_bug.cgi?id=2243
Re: svn diff of working copy file to unrelated branch file
On Jun 29, 2012, at 16:38, jwenn...@rockwellcollins.com wrote: > The svn diff syntax you provided works exactly as expected. > > I would suggest adding this to the online subversion manual at > http://svnbook.red-bean.com/en/1.7/index.html. > > "At this point, the wise thing to do is look at the changes carefully with > svn diff, and then build and test your branch." > > It would be useful to mention the syntax of the svn diff command here so that > user's can see exactly how to do it. > I think it would save a lot of developers time. FYI, suggestions for book changes are best sent to the book mailing list: http://www.red-bean.com/mailman/listinfo/svnbook-dev
