|
|
| Re: Discover WC status [message #538225 is a reply to message #537906] |
Sun, 06 June 2010 18:32   |
 olly2 Mising name
Messages: 27
Registered: June 2010 |
Junior Member |
|
|
Hello Igor,
thank you for your answer.
In fact I want to check my WC status before a merge operation. I usually follow the suggestions from the book:
| Quote: | However you get a trunk working copy, remember that it's a best practice to do your merge into a working copy that has no local edits and has been recently updated (i.e., is not a mixture of local revisions). If your working copy isn't "clean" in these ways, you can run into some unnecessary conflict-related headaches and svn merge will likely return an error.
|
http:// svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging .html
To check for local changes using subversive is quite easy. But I also want to take care of a "clean" WC, where I do not have a mixture of local revisions. Well, right now I can update to the latest revision and after that I hopefully "know" that I have exactly this revision. But anyway, I think it would be a good idea to be able to check for this.
Another use case would be if I create a branch from my WC. Well, it is best practice to create a branch of a single revision. If you want to fullfill this and want to create the branch on the wc then it would be helpful to be able to check the WC using subversive. Well, I know that I can create a singel revision branch using a server side copy - but in my company there are a lot of people that are used to do everything based on their WC.
It is so easy to get this information using svn status -v or svnversion.
Thank you and best regards,
Olaf
[Updated on: Sun, 06 June 2010 18:33] Report message to a moderator |
|
|
| Re: Discover WC status [message #538274 is a reply to message #538225] |
Mon, 07 June 2010 07:55 |
Igor Burilo
Messages: 435
Registered: July 2009 |
Senior Member |
|
|
Hello Olaf,
Subversive doesn't allow to detect whether you have mixed revision
working copy, but this is not necessary, you can always run svn update
and you'll exactly get 'clean' working copy.
> Hello Igor,
> thank you for your answer.
>
> In fact I want to check my WC status before a merge operation. I usually
> follow the suggestions from the book:
>
> Quote:
>> However you get a trunk working copy, remember that it's a best
>> practice to do your merge into a working copy that has no local edits
>> and has been recently updated (i.e., is not a mixture of local
>> revisions). If your working copy isn't "clean" in these ways, you can
>> run into some unnecessary conflict-related headaches and svn merge
>> will likely return an error.
> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basic merging.html
>
> To check for local changes using subversive is quite easy. But I also
> want to take care of a "clean" WC, where I do not have a mixture of
> local revisions. Well, right now I can update to the latest revision and
> after that I hopefully "know" that I have exactly this revision. But
> anyway, I think it would be a good idea to be able to check for this.
>
> Another use case would be if I create a branch from my WC. Well, it is
> best practice to create a branch of a single revision. If you want to
> fullfill this and want to create the branch on the wc then it would be
> helpful to be able to check the WC using subversive. Well, I know that I
> can create a singel revision branch using a server side copy - but in my
> company there are a lot of peolple that are used to do everything based
> in the WC.
>
> It is so easy to get this information using svn status -v or svnversion.
> Thank you and best regards,
> Olaf
--
Best regards,
Igor Burilo
|
|
|
|
|
|
| Re: Discover WC status [message #540734 is a reply to message #540441] |
Thu, 17 June 2010 08:28 |
Igor Burilo
Messages: 435
Registered: July 2009 |
Senior Member |
|
|
Hello Olaf,
I agree with you that working copy should be in single revision for
merge and branching, although it's SVN recommendation, and to follow
this recommendation you can call Update action, so Subversive provides
enough functionality to make a single revision WC. From the other side
knowing whether we have a mixed revision WC could be sometimes useful,
but if we find that this functionality highly usable and desirable by
users we'll add it in the future.
Thanks for your notes.
> Of course.
>
> First I want to make this assumption: lets say you make an update of
> your WC, so no incoming changes. After that you change some files and
> commit them. In the end you have a situation with no incoming changes
> but a mixed revision WC.
>
> I personally see two use cases when it is very helpful to check your WC
> whether it is a single or mixed revision WC.
>
> 1.: Merging. It is recommended and as far as I can see best practise to
> have a single revision WC before merging.
> 2.: Branching based on local WC.
> When creating a branch based on local WC you shopuld also have a single
> revision WC (strongly recommended). I know that it is not absolutly
> necessary to create the branch based on WC - but in the real world not
> everybody is a SVN expert. In our company a lot of people do a lot of
> things, and one of that is working with SVN. Creating a branch based on
> the WC seems to be more intuitive then creating a server site branch.
>
> Hopefully this helps,
>
> best regards,
> Olaf
>
--
Best regards,
Igor Burilo
|
|
|
Powered by
FUDForum. Page generated in 0.03040 seconds
] 
Search
Help
Register
Login
Home
