Re: merge using same revision number - quick question

2013-04-22 Thread Johan Corveleyn
[ Please don't top-post on this list, i.e. try to put your reply at the bottom or inline. More below ... ] On Sat, Apr 20, 2013 at 2:32 AM, Z W mpc8...@gmail.com wrote: On Fri, Apr 19, 2013 at 9:36 AM, Bob Archer bob.arc...@amsi.com wrote: Hi All We have a revision that contains a few

Re: svn merge and svnmerge - quick question.

2013-04-22 Thread Johan Corveleyn
On Mon, Apr 22, 2013 at 5:11 AM, Z W mpc8...@gmail.com wrote: Hi All We have 1.6 SVN. Can svnmerge.py and svn merge be used on the same working copy directory for merging from trunk to branch ? I have no experience with svnmerge.py, but I wouldn't really recommend it. AFAIU they will not

Question re: svn Needs-Lock

2013-04-22 Thread Ahmed, Omair (GE Oil Gas)
Hello, Is Needs-Lock the correct (or expected) mechanism by which to make a release tag immutable? Basically, I am looking for a way to lock a tag to prevent accidental updates. Thanks. Omair

Re: Question re: svn Needs-Lock

2013-04-22 Thread Andy Levy
On Mon, Apr 22, 2013 at 3:30 PM, Ahmed, Omair (GE Oil Gas) omair.ah...@ge.com wrote: Hello, Is Needs-Lock the correct (or expected) mechanism by which to make a release tag immutable? Basically, I am looking for a way to lock a tag to prevent accidental updates. No. svn:needs-lock is an

Re: svn merge --record-only, svn merges - how to use - quick question

2013-04-22 Thread Johan Corveleyn
On Mon, Apr 22, 2013 at 5:15 AM, Z W mpc8...@gmail.com wrote: Hi All How does one use --record-only option with svn merge ? It is used to tell svn that a revision has already been merged. A typical use case is when you want to block a certain revision from being merged. See

Blame/annotate not good enough...

2013-04-22 Thread Charles Gallo
Hey Gang, Ok, IMHO, they are good enough, but not for my current client. They basically want to append the Equivalent of blame or annotate to the actual source code lines! So say in c# you'd see A++ //CAG 2013-04-13 Yep, they also don't want you deleting code, you comment it out... Their

Re: merge using same revision number - quick question

2013-04-22 Thread Johan Corveleyn
On Mon, Apr 22, 2013 at 10:00 PM, Z W mpc8...@gmail.com wrote: Hi Johan Thanks for responding. You're welcome :-). I'm putting the users list back in cc to keep it in the loop. Please remember to use reply all for this reason. We didnt know of the subtree merging concept and you are right,

Re: Blame/annotate not good enough...

2013-04-22 Thread Daniel Shahaf
Charles Gallo wrote on Mon, Apr 22, 2013 at 16:13:25 -0400: Any ideas on how to do this? Probably some sort of pre commit hook, but... but pre-commit hooks can't modify the in-flight txn without breaking the committing working copy.

Re: Blame/annotate not good enough...

2013-04-22 Thread Charlie Gallo
On 4/22/2013 Daniel Shahaf wrote: Charles Gallo wrote on Mon, Apr 22, 2013 at 16:13:25 -0400: Any ideas on how to do this? Probably some sort of pre commit hook, but... but pre-commit hooks can't modify the in-flight txn without breaking the committing working copy. Ouch... So, ideas?