actually
using tortoise proxy configuration.
regards
Emerson
d out which the revisions actually
had the tree conflict?
The tree conflict messages are also really vague, without telling
exactly what the conflict is, which file or folder is missing or
whichever reason caused the tree conflict. Is there any way to get the
reason of the tree conflict?
Regards
Emerson
k. Besides helping in tracing the changes in the branch the
the original logs, is there any other utility in having the mergeinfo
information?
regards
Emerson
On this other example I get a conflict when doing a dry-run, but when
carrying out the real merge it doesn't complain:
emer...@emerson-desktop:~/workspace/branches/stable$ svn merge
--dry-run http://subversionserver/svn/cpndotcom/trunk -c
81067,81094,81095
--- Merging r81067 into &
wed?
thanks for the help
Emerson
On 8 July 2010 13:41, emerson wrote:
> Ops, missed the reply-all.
>
> That specific file hasn't changed since the branch was created, still
> I got the tree conflict when it was deleted in svn.
>
> And for other files that I get tree con
og to see that.
>
> Regards
> Olivier
>
> PS: Please reply to the list as well.
>
> emerson wrote:
>>
>> Hi Olivier
>>
>> That is the thing, there is no changes done in that specific file!
>>
>> I just did:
>> - revert that file
>&
c revision that deletes a file.
emer...@emerson-desktop:~/workspace/branches/stable$ svn merge
http://subversion/svn/dotcom/trunk -c 80520
--- Merging r80520 into '.':
C
modules/com.yell.ucssearch/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
Summary of conflicts:
As a result of this new process, developers are doing a lot more local
updates. How much of CPU this takes from the server?
regards
Emerson
On 7 July 2010 12:10, emerson wrote:
> We started to use a two tiered baseline approach, with a development
> trunk and a stable branch.
> Everyd
gle file.
We are using the "svn merge http://[repo] -c 333" command syntax.
Our server is 1.4.4, and we are using 1.6.x clients.
We are in the process of updating to the latest version on the server,
is there anything I can try to improve the performance?
thanks
Emerson
, as in some cases the differents commits were
related to the same bit of code.
Is there anyway to have in one command line a behaviour that would
take in account the previous revisions?
thanks
Emerson
On 17 June 2010 14:53, emerson wrote:
> On 17 June 2010 13:29, Andy Levy wrote:
>&g
# code of the story.
Correct me if I am wrong, but from there I would have to collect all
the revision numbers, and apply them in a single merge manually? Is
there any way to automate this?
thanks
emerson
On 16 June 2010 22:40, Daniel Becroft wrote:
> On Thu, Jun 17, 2010 at 4:20 AM, Bob Arc
first locate all the
changes to svn that had that code on the commit message, and then
re-apply them to the stable branch, just not sure how to do it.
Any ideas?
regards
Emerson
first locate all the
changes to svn that had that code on the commit message, and then
re-apply them to the stable branch, just not sure how to do it.
Any ideas?
regards
Emerson
first locate all the
changes to svn that had that code on the commit message, and then
re-apply them to the stable branch, just not sure how to do it.
Any ideas?
regards
Emerson
14 matches
Mail list logo
