subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Eric Johnson <e...@tibco.com>
Subject Re: SVN update and conflict
Date Wed, 04 Jun 2014 17:05:39 GMT
A little difficult to figure out from your wording exactly what you're
doing.

I would suggest that rather than sending just the code to the offshore
team, send a zip of a working copy (assuming they're on the same platform).
Offshore developers should use commands like "svn delete", "svn move", and
"svn copy" rather than directly moving, deleting, copying on the file
system. Send the working copy back and forth, rather than bare files.

Then have your onshore developer treat the working copy just as they would
their own.

By which I mean:

Commit workflow:
"svn update"
-- resolve merge issues.
-- build, and run all automated tests - correct issues as appropriate
-- inspect code changes to identify salient details to put into the commit
message.
-- finally commit...

Seems like that would be easier than what you describe.

Eric.


On Wed, Jun 4, 2014 at 7:25 AM, Deepthi Pentyala <
deepthi_pentyala@iroquois.com> wrote:

>  Hi,
>
>
>
> In our company we get code from offshore team and we have couple of
> developers working here too. Every day the code from offshore will be
> replaced(copy the folders and replace them)  by an onsite person first at
> his local copy which will show as modified in SVN.
>
> When he tries to update before committing his changes as there are some
> changes made by the developers  here as well  it doesn’t update and when he
> tries to commit assuming it will show conflict message it just overrides.
> We even checked if its merging the changes but it’s not.
>
> We are having problems when we are copying and replacing files otherwise
> works fine as its suppose to.
>
>
>
> My questions here are:
>
> 1.       Are we following  wrong procedure of copying and pasting files
> and updating?
>
> 2.       Is there any better way to do this?
>
> 3.       Why doesn’t it update or show some kind of conflict ?
>
>
>
> Thank you,
>
>
>
> Deepthi
>

Mime
View raw message