Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E662211C7C for ; Wed, 4 Jun 2014 17:06:25 +0000 (UTC) Received: (qmail 20061 invoked by uid 500); 4 Jun 2014 17:06:25 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 20027 invoked by uid 500); 4 Jun 2014 17:06:25 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 20020 invoked by uid 99); 4 Jun 2014 17:06:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jun 2014 17:06:25 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW X-Spam-Check-By: apache.org Received-SPF: unknown (athena.apache.org: error in processing during lookup of eric@tibco.com) Received: from [209.85.212.169] (HELO mail-wi0-f169.google.com) (209.85.212.169) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jun 2014 17:06:21 +0000 Received: by mail-wi0-f169.google.com with SMTP id hi2so8189168wib.0 for ; Wed, 04 Jun 2014 10:05:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:content-type; bh=7AXvg7ZlyD/fnI6Q1sPLV8xTFB/+lH3EbMOIPEhwLTc=; b=K++OCTioqDozZT3blQ7vfqrp8L3BsMbTZQqS9lyxWwAQsJLXK3bezFf1rjlrzvJ1me B7uP53lEnY7KvF7EvIi0MJkZOz4XcviL52Wqok4JsHpliuY5OvJBOwKg/pEKdlIvaRTl 7k3Hgtlor18s2CBV8A+g5Rr4H6e7T9ww3AVNlFTTzoTuDLYN8VCmgN8A+1R4rpLtypUd sA1wppBPkdFUCPvMKD0yEenJxx7pT+oE5JSt2Z1x0N92UPO9eofQNjIWgEnXAshiMQwS hPboxwhn2TMun+WSdJT944qkgeUE4CguHvrunQWJk0XuKyVK4zSUhFlHJaDU21O+ALM6 hiTg== X-Gm-Message-State: ALoCoQkOcvvGePi5jM+2vT70I/C/d1itvODLuSOYRoncrBT1xB9twknTeCJYxHZAzWpJNzwAeER1 X-Received: by 10.180.206.132 with SMTP id lo4mr7285816wic.46.1401901559434; Wed, 04 Jun 2014 10:05:59 -0700 (PDT) MIME-Version: 1.0 Received: by 10.194.108.10 with HTTP; Wed, 4 Jun 2014 10:05:39 -0700 (PDT) In-Reply-To: References: From: Eric Johnson Date: Wed, 4 Jun 2014 10:05:39 -0700 Message-ID: Subject: Re: SVN update and conflict To: "users@subversion.apache.org" Content-Type: multipart/alternative; boundary=001a11c326aa75ed2d04fb05a4ab X-Virus-Checked: Checked by ClamAV on apache.org --001a11c326aa75ed2d04fb05a4ab Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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=E2=80=99t update a= nd when he > tries to commit assuming it will show conflict message it just overrides. > We even checked if its merging the changes but it=E2=80=99s 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=E2=80=99t it update or show some kind of conflict ? > > > > Thank you, > > > > Deepthi > --001a11c326aa75ed2d04fb05a4ab Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
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 c= opy" 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 tes= ts - correct issues as appropriate
-- inspect code changes to ide= ntify salient details to put into the commit message.
-- finally = commit...

Seems like that would be easier than what you describe.=

Eric.

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

Hi,

=C2=A0

In our company we get code from offshore team and we= have couple of developers working here too. Every day the code from offsho= re will be replaced(copy the folders and replace them) =C2=A0by an onsite p= erson first at his local copy which will show as modified in SVN.

When he tries to update before committing his change= s as there are some changes made by the developers =C2=A0here as well =C2= =A0it doesn=E2=80=99t update and when he tries to commit assuming it will s= how conflict message it just overrides. We even checked if its merging the changes but it=E2=80=99s not.

We are having problems when we are copying and repla= cing files otherwise works fine as its suppose to.

=C2=A0

My questions here are:

1.= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Are we following =C2=A0wrong procedure of copying and = pasting files and updating?

2.= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Is there any better way to do this?

3.= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Why doesn=E2=80=99t it update or show some kind of con= flict ?

=C2=A0

Thank you,

=C2=A0

Deepthi


--001a11c326aa75ed2d04fb05a4ab--