Goto page Previous 1, 2
Symon
Guest
Sun Apr 04, 2010 12:45 am
Dear Andrew,
I know this is rude to email directly, but I don't suppose you would
like to answer my usenet query on comp.lang.vhdl about git? I felt free,
and your original reply was one of the most cogent usenet replies I've seen!
Thanks. Symon.
rickman
Guest
Mon Apr 05, 2010 6:38 pm
On Mar 29, 6:16 pm, Andy Peters <goo...@latke.net> wrote:
Quote:
On Mar 25, 8:37 am, rickman <gnu...@gmail.com> wrote:
On Mar 25, 7:27 am, Marcus Harnisch <marcus.harni...@gmx.net> wrote:
rickman <gnu...@gmail.com> writes:
Reading the manual it seems to be saying that if I want to set a
baseline with a tag or if I want to create a branch, I can copy
everything to a separate folder.
That would be SVN's own copy, not a file system copy. The duplication
happens inside the database (repository).
I guess I don't understand this. How do I make a copy in a new
directory that is a "SVN copy"?
You are making the copy in the repository.
Maybe I don't understand that. I am using SVN with Tortoise and I see
the files in the regular directory tree using Windows Explorer. How
do I make a copy just in the repository? Do I use a special command
for that?
There are a number of other things I am unclear about. I have tried
looking at the docs, but they seemed to be explaining things that I
wasn't confused about. Should I go back and read it again? I can't
imagine this is really that hard. I expect I just have a mindset
about some aspect of this that is making it hard for me.
Rick
Andy Peters
Guest
Mon Apr 05, 2010 9:48 pm
On Apr 5, 8:38 am, rickman <gnu...@gmail.com> wrote:
Quote:
On Mar 29, 6:16 pm, Andy Peters <goo...@latke.net> wrote:
On Mar 25, 8:37 am, rickman <gnu...@gmail.com> wrote:
On Mar 25, 7:27 am, Marcus Harnisch <marcus.harni...@gmx.net> wrote:
rickman <gnu...@gmail.com> writes:
Reading the manual it seems to be saying that if I want to set a
baseline with a tag or if I want to create a branch, I can copy
everything to a separate folder.
That would be SVN's own copy, not a file system copy. The duplication
happens inside the database (repository).
I guess I don't understand this. How do I make a copy in a new
directory that is a "SVN copy"?
You are making the copy in the repository.
Maybe I don't understand that. I am using SVN with Tortoise and I see
the files in the regular directory tree using Windows Explorer. How
do I make a copy just in the repository? Do I use a special command
for that?
Yes, there's a special command, svn copy.
If you wish to make a branch from your __checked-out working copy__,
right click on its icon, choose "TortoiseSvn" then "Branch/Tag." A
dialog box titled "Copy (Branch/Tag)" will pop up.
You'll see:
From WC at URL:
svn://eng-andrew/fpga/projects/CameraSim/trunk (not editable)
and
To URL:
svn://eng-andrew/fpga/projects/CameraSim/trunk (list box)
(note that they are the same, to start). This is followed by:
Create Copy in the repository from:
( ) HEAD revision in the repository
(*) Specific revision in the repository [2272] ...
( ) Working copy
followed by an entry box for the log message.
Now remember: In this example, you want to use your checked-out
working copy as the starting point for a new branch. (This working
copy may have edits to any of the files -- this is fine!) First,
select the "Working copy" radio button. This means that the new branch
will use the working copy as its base (and all history is retained).
Then, next to the "To URL:" combo box is a button with ellipsis. Click
it, and the repository browser opens to the project's location in the
repo. In the left-hand pane is the repo tree. If you've used the
standard trunk/branches/tags format, click on the project name in the
left-hand pane, and click the "+" to expand the tree. Click "branches"
then click "OK" and you're back to the dialog. Click in the "To URL"
combo box and put your cursor after "branches" in the URL. Finish the
URL by giving it a useful branch name:
svn://eng-andrew/fpga/projects/CameraSim/branches/testbranch
Enter a useful log message ("Creating branch to test X, Y, Z" or
whatever). Make sure you CHECK the box labeled "Switch working copy to
new branch/tag" then click "OK." Voila, you've now created a branch
and your working copy is now of that branch, not the trunk.
Quote:
There are a number of other things I am unclear about. I have tried
looking at the docs, but they seemed to be explaining things that I
wasn't confused about. Should I go back and read it again? I can't
imagine this is really that hard. I expect I just have a mindset
about some aspect of this that is making it hard for me.
it's really not that hard but it can be somewhat non-obvious.
=-a
rickman
Guest
Tue Apr 06, 2010 8:57 pm
On Apr 5, 2:48 pm, Andy Peters <goo...@latke.net> wrote:
Quote:
On Apr 5, 8:38 am, rickman <gnu...@gmail.com> wrote:
On Mar 29, 6:16 pm, Andy Peters <goo...@latke.net> wrote:
On Mar 25, 8:37 am, rickman <gnu...@gmail.com> wrote:
On Mar 25, 7:27 am, Marcus Harnisch <marcus.harni...@gmx.net> wrote:
rickman <gnu...@gmail.com> writes:
Reading the manual it seems to be saying that if I want to set a
baseline with a tag or if I want to create a branch, I can copy
everything to a separate folder.
That would be SVN's own copy, not a file system copy. The duplication
happens inside the database (repository).
I guess I don't understand this. How do I make a copy in a new
directory that is a "SVN copy"?
You are making the copy in the repository.
Maybe I don't understand that. I am using SVN with Tortoise and I see
the files in the regular directory tree using Windows Explorer. How
do I make a copy just in the repository? Do I use a special command
for that?
Yes, there's a special command, svn copy.
If you wish to make a branch from your __checked-out working copy__,
right click on its icon, choose "TortoiseSvn" then "Branch/Tag." A
dialog box titled "Copy (Branch/Tag)" will pop up.
You'll see:
From WC at URL:
svn://eng-andrew/fpga/projects/CameraSim/trunk (not editable)
and
To URL:
svn://eng-andrew/fpga/projects/CameraSim/trunk (list box)
(note that they are the same, to start). This is followed by:
Create Copy in the repository from:
( ) HEAD revision in the repository
(*) Specific revision in the repository [2272] ...
( ) Working copy
followed by an entry box for the log message.
Now remember: In this example, you want to use your checked-out
working copy as the starting point for a new branch. (This working
copy may have edits to any of the files -- this is fine!) First,
select the "Working copy" radio button. This means that the new branch
will use the working copy as its base (and all history is retained).
Then, next to the "To URL:" combo box is a button with ellipsis. Click
it, and the repository browser opens to the project's location in the
repo. In the left-hand pane is the repo tree. If you've used the
standard trunk/branches/tags format, click on the project name in the
left-hand pane, and click the "+" to expand the tree. Click "branches"
then click "OK" and you're back to the dialog. Click in the "To URL"
combo box and put your cursor after "branches" in the URL. Finish the
URL by giving it a useful branch name:
svn://eng-andrew/fpga/projects/CameraSim/branches/testbranch
Enter a useful log message ("Creating branch to test X, Y, Z" or
whatever). Make sure you CHECK the box labeled "Switch working copy to
new branch/tag" then click "OK." Voila, you've now created a branch
and your working copy is now of that branch, not the trunk.
There are a number of other things I am unclear about. I have tried
looking at the docs, but they seemed to be explaining things that I
wasn't confused about. Should I go back and read it again? I can't
imagine this is really that hard. I expect I just have a mindset
about some aspect of this that is making it hard for me.
it's really not that hard but it can be somewhat non-obvious.
=-a
Hey, thanks a lot. I didn't see the menu item in Tortoise. I guess
that makes it easier... :^s The explanation helps a lot too.
Rick
Andrew FPGA
Guest
Tue Apr 13, 2010 1:56 pm
Apologies for the slow reply - wish I had a way of automatically being
told when someone replies to a message I've posted on a thread? I use
google groups....
Quote:
One question is, how do all the clients pull data from all the others?
Some (all?) clients are behind firewalls? You seem to say in the
implementation you use, pushes happen to a central server, just like
SVN, but pulls happen from a local server. Is this local server pushed
to by the central server or does the local server pull from the central
server? Or something else?
Ok, so for our company, all clients must be on the VPN before can pull/
push with the servers. I don't know the details but the VPN goes
through the various firewalls somehow - standard IT/networking thingy.
Plenty of open source projects use git so they must deal with the
firewall thing somehow.
So for our source control policy, clients don't pull/push from/to each
other. Only with the servers. Here is an example transcript when I
type "git update". This is an in-house script that will get my client
repo up-to-date with the master server.
$ git update
Full Fetch:
$ git config remote.origin.url
git://<local server name>
$ git fetch origin
$ git config remote.origin.url
git://<remote server name>
$ git fetch origin --tags
$ git fetch origin
Local branch [master] is tracking [origin/master].
Merging changes into current branch:
$ git merge origin/master
Already up-to-date.
Remove stale tracking branches:
$ git remote prune origin
So you will see it fetches from the local server first. Thats fast/
cheap. Then it fetches from the master server which is at remote
geographical location for our site.
I don't know how the local/remote servers stay in sync. I presume the
local server pulls from the remote/master periodically.
When I push I push to the remote(master) server.
Quote:
My second question is, is there necessarily a master copy stored
anywhere? I'm not exactly even sure what this means in git-world, so
excuse me if this is dumb. I think I'm confused as to how clients know
whether their personal repositories are up-to-date with respect to other
clients.
So for our company, I guess the master server, is well, the master
server. And all these servers must be backed up as per normal IT
stuff.
To find out if my client repo is out of date, I go git fetch. Then I
can go git diff origin/master master to see what the differences are
if any. Read up on git branches and tracking branches.
Hope this helps.
Cheers
Andrew
Anssi Saari
Guest
Thu Dec 22, 2011 6:16 pm
KJ <kkjennings_at_sbcglobal.net> writes:
Quote:
Old thread, but now that svn 1.7.0 has been out a while, I take it this
issue with tagging externals was indeed addressed in svn?
KJ
Guest
Thu Dec 22, 2011 9:46 pm
On Dec 22, 12:16 pm, Anssi Saari <a...@sci.fi> wrote:
Quote:
KJ <kkjenni...@sbcglobal.net> writes:
Interestingly enough, it seems there might be movement afoot to
address this limitation when version SVN 1.7.0 comes out based on the
following thread...or maybe I'm just hoping...
http://groups.google.com/group/tortoisesvn/browse_frm/thread/0337cb91...
Old thread, but now that svn 1.7.0 has been out a while, I take it this
issue with tagging externals was indeed addressed in svn?
The TortoiseSVN folks appear to have implemented this, but it looks
like there was some problem with what was implemented in version 1.7.0
(http://groups.google.com/group/tortoisesvn/browse_frm/thread/
2e177939eb4a5b77?hl=en#)
They are currently up to version 1.7.3 which fixes "some nasty bugs in
TortoiseSVN 1.7.2 which in some specific situations could make it
crash" (http://groups.google.com/group/tortoisesvn/browse_frm/thread/
b98f1e75307fbc35/208835526c8bc206?hl=en&lnk=gst&q=tortoisesvn
+1.7+released#208835526c8bc206)
It is still on my 'to do' list to see how well the new feature
actually works. I like TortoiseSVN, but this limitation with
externals was frustrating...and the Perl script method didn't work for
me on some computers. Hopefully TortoiseSVN has this working now.
Kevin Jennings
Goto page Previous 1, 2
