subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andy Levy <andy.l...@gmail.com>
Subject Re: SVN update and conflict
Date Wed, 04 Jun 2014 17:49:47 GMT
On Wed, Jun 4, 2014 at 10: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.

Define "doesn't update". You should be updating your WC before pasting
the offshore code into the WC, and when you do that it should at least
tell you what revision you've been updated to (if there are changes
received).

Conflicts (which require merging) happen in the working copy when you
update, not when committing. Merges similarly happen in the WC, not
during the commit. But neither of these should be happening (for the
person performing this procedure) if the WC is up to date and you're
doing a direct copy/paste.

> 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?

We can't see exactly what you're doing when performing this copy &
paste and your description of the events that transpire are hard to
follow, so it's hard to say. Is your onsite person's working copy
fully up to date before he pastes in the offshore code? Is he
overwriting/corrupting the .svn directory?

> 2.       Is there any better way to do this?

Don't do it. Have your offshore developers commit their code
directly to the repository.

> 3.       Why doesn’t it update or show some kind of conflict ?
>

See the answer to #1.

Mime
View raw message