[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Commits files to subversion from 2 different directories

From: ying lcs <yinglcs_at_gmail.com>
Date: 2007-01-16 06:26:12 CET

What I am trying to find out is after i did svn_load_dirs.pl once to
my modified-source,
and tag that as VERSION2, I find out that i miss some files.

how can i import those missing files and tag them as VERSION2?
Should I use the 'svn import' command? But how can I re-tag those new
adding files as VERSION2?

Or I put those new files in modified-source directory and reapply the
'svn_load_dirs.pl' script.

What is a better solution?

thank you for any advice.

On 1/15/07, ying lcs <yinglcs@gmail.com> wrote:
> Thanks. But what happens if I do this:
>
> * make some changes to modified-source directory (after i execute
> svn_load_dirs.pl once).
>
> * Use svn_load_dirs.pl to load modified-source and to re-tag it as VERSION2?
>
> or
>
> * Use svn_load_dirs.pl to load modified-source and to re-tag it as VERSION3?
>
>
>
>
> On 1/15/07, Ryan Schmidt <subversion-2007a@ryandesign.com> wrote:
> > On Jan 15, 2007, at 22:32, ying lcs wrote:
> >
> > > On 1/14/07, Ryan Schmidt wrote:
> > >
> > >> On Jan 14, 2007, at 10:27, ying lcs wrote:
> > >>
> > >> > 1. create a new repository 'source' in subversion
> > >>
> > >> svnadmin create /srv/svn/repositories/source
> > >>
> > >> > 2. cd to org-source and
> > >> > svn import . file:///srv/svn/repositories/source --message
> > >> > "Initial import"
> > >>
> > >> For each new project, you should generally set up the recommended
> > >> "trunk" / "branches" / "tags" directory structure. The reasons are
> > >> explained in the book:
> > >>
> > >> http://svnbook.red-bean.com/en/1.2/svn.branchmerge.using.html
> > >>
> > >> So create these empty directories:
> > >>
> > >> svn mkdir file:///srv/svn/repositories/source/trunk \
> > >> -m "Making trunk dir"
> > >> svn mkdir file:///srv/svn/repositories/source/branches \
> > >> -m "Making branches dir"
> > >> svn mkdir file:///srv/svn/repositories/source/tags \
> > >> -m "Making tags dir"
> > >>
> > >> Then you can import the original source into the trunk.
> > >>
> > >> svn import /path/to/org-source \
> > >> file:///srv/svn/repositories/source/trunk \
> > >> -m "Initial import"
> > >>
> > >> > 3: tag all the files in the source with a label called 'VERSION1"
> > >>
> > >> Create the "VERSION1" tag by copying the trunk to a new name in the
> > >> tags directory:
> > >>
> > >> svn cp file:///srv/svn/repositories/source/trunk \
> > >> file:///srv/svn/repositories/source/tags/VERSION1 \
> > >> -m "Creating VERSION1 tag"
> > >>
> > >> > 4: commit all files in the directory 'modified-source' to
> > >> subversion
> > >> > so that subversion can figure out what files are different. And it
> > >> > will create a new version if the files is different and add the
> > >> files
> > >> > to the repository if it is a new file.
> > >> >
> > >> > 5. tag all the files in trunk with a label called VERSION2"
> > >>
> > >> Use svn_load_dirs.pl to load modified-source and tag it as VERSION2:
> > >>
> > >> svn_load_dirs.pl \
> > >> -t tags/VERSION2 \
> > >> file:///srv/svn/repositories/source \
> > >> trunk \
> > >> /path/to/modified-source
> > >
> > > After following the last steps of your instruction " Use
> > > svn_load_dirs.pl to load modified-source and tag it as VERSION2:",
> > >
> > > should i execute 'svn update' to make my 'modified-source' directory a
> > > 'working directory?
> >
> > "svn update" does not make an unversioned directory into a working
> > copy. It merely updates a working copy. And it cannot be done in a
> > directory that is not already a working copy.
> >
> > > Or should i execute 'svn checkout' to a new directory and make that my
> > > 'working directory and removing my 'org-source' and 'modified-source'
> > > directory.
> >
> > Correct, that is what you will need to do.
> >
> > > Right now, when i commit a file from my 'modified-source' directory,
> > > it said 'svn: modified-source' is not a working copy.
> >
> > Right: modified-source is not a working copy, so you cannot "svn
> > commit" or "svn update" in it.
> >
> >
> > --
> >
> > To reply to the mailing list, please use your mailer's Reply To All
> > function
> >
> >
> >
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 16 06:26:32 2007

This is an archived mail posted to the Subversion Users mailing list.