Resolved! thnks for all!!! Your answer very usefuly!!!
I flow:
'svn merge -r 3256:3255 svn://svn.mylocation/repositoryName/trunk'
svn commit -m 'merge 3256:3255'
Until I reached 3243!!!
Thnks!
Steven Koch
2010/8/18 Giulio Troccoli
> > > We have two servers(stagging and production), one
On 8/18/2010 8:07 AM, Steven Koch wrote:
Hi,
I need update the servers, and continue send changes to the point
3243! but actual content of SVN server are different (now r3251 is
considered new files, same that they are equals files)
If you deleted the trunk and then committed new copies of the
> > We have two servers(stagging and production), one
> development machine
> > and one repository SVN server separated.
Do you mean to say that the staging and production machines have a working copy
of the same SVN repository?
> > > If you have reverse-merge the offending revisions than
> your
Hi
You're not really making sense, but I would recommend that you leave your
working copy alone for now.
Make a new checkout that will get you latest in trunk.
Merge back to the revision you wanted and commit..
Now you should be back where you were before you messed up.
Then ask us for help on w
But I know'n making it!!
:(
On Aug 18, 2:07 pm, Steven Koch wrote:
> Hi,
>
> I need update the servers, and continue send changes to the point
> 3243! but actual content of SVN server are different (now r3251 is
> considered new files, same that they are equals files)
>
> We have two servers(sta
Hi,
I need update the servers, and continue send changes to the point
3243! but actual content of SVN server are different (now r3251 is
considered new files, same that they are equals files)
We have two servers(stagging and production), one development machine
and one repository SVN server sepa
> Thnks
>
>
> But, I can rolback the revision on my working copy (NOW my
> working copy are 3243, and the SVN 3251), but not can commit
> this 'rollback'
> to trunk! because this revision already exists on SVN Server
If you have reverse-merge the offending revisions than your working copy is at
r
Thnks
But, I can rolback the revision on my working copy (NOW my working
copy are 3243, and the SVN 3251), but not can commit this 'rollback'
to trunk! because this revision already exists on SVN Server
This causing that the servers cannot update your files, because same
files already exists and
2010/8/18 Steven Koch :
> Hi
>
> I'm in a dirt, and would like a help!
>
> I will describe the workflow of the donkey:
>
> - Copy the contents of a local branch to another folder and removed
> all references .svn this folder.
> - And later removed the contents of the trunk location, via "svn rm"
>
> Hi
>
> I'm in a dirt, and would like a help!
>
> I will describe the workflow of the donkey:
>
> - Copy the contents of a local branch to another folder and
> removed all references .svn this folder.
> - And later removed the contents of the trunk location, via "svn rm"
> and submitted via commit
Hi
I'm in a dirt, and would like a help!
I will describe the workflow of the donkey:
- Copy the contents of a local branch to another folder and removed
all references .svn this folder.
- And later removed the contents of the trunk location, via "svn rm"
and submitted via commit this change.
- C
11 matches
Mail list logo
