Re: logging externals commit
On Oct 6, 2013, at 08:12, Zvika Castel wrote: > In general, it's about seeing the log of a commit to an externals file. > I will try to describe the situation: > I have folder named "Master" with file named "FileA.txt" in it. > Somewhere in the project tree I have also a folder named "Slave" with an > externals "FileB.txt" pointing to "Master/FileA.txt" > Now, on Update I get two files on my working directory tree, FileA under > Master and FileB under Slave. > A developer changed "FileB.txt" and commit his changes (at this point changes > were made on FileA.txt because it's a "share"). > Now, I open the log to see all the changes made on "Slave" folder and… > There is not a single sign that someone has change "FileB.txt" > > I know what SVN is doing under the hood, I know I can see the log of "Master" > folder and see the transaction over there, but… > What I expected, as a developer, that SVN will show me MY actions, not his. > When I open the log of "Slave" folder I want to see that someone has changed > "FileB.txt". > > Consider this as a feature request. That might be difficult to do. Externals could be in a different repository on a different server.
Re: tree conflict: local add, incoming add upon merge
Stanimir: your comment is pure gold. Thank you very much. On Tuesday, May 24, 2011 11:11:20 AM UTC-4, Stanimir Stamenkov wrote: > > Tue, 24 May 2011 10:45:09 -0400, /David Tombs/: > > > I created the same directory, called 'config' on two branches. The > > directory had different files on each branch, let's call them 'foo.java' > > on branch A and 'bar.java' on branch B. > > > > When I merged branch A -> branch B, I got a "tree conflict" saying > "local > > add, incoming add upon merge." I can understand this error: the merge > > tried to add the directory as expected but it was already there. My > > desired resolution is to keep the 'config' directory and just add the > file > > from branch A. That is, 'config' would contain both foo.java and > bar.java. > > > > The only way to achieve this I found was to delete 'config' (with no > > commit), do the merge, and then revert the deletion of bar.java. It > > worked, but it seems weird to do a delete just to revert it. Do you know > > any better way of doing it? It took me a while to figure out the > > solution, with lots of fruitless Googling. > > Suppose you've checked out branch A and then merged with branch B: > > svn merge ^/branches/B > > You've got tree conflict for the "config" directory saying "local > add, incoming add upon merge". Then you additionally merge: > > svn merge ^/branches/B/config config > > -- > Stanimir > >
svn backup
I am confused on how to backup my repositary. There is an /export/svn directory that holds all the projects directories, hook, format lock, db etc... its about 14 GB I did do a svnadmin dump /export/svn > /test/file.dump and I get a very small file, I restored it and it consists of hook, format, lock, db, conf and its about 304 KB What am I doing wrong?
Re: svn backup
Guten Tag rvaede, am Montag, 7. Oktober 2013 um 21:37 schrieben Sie: >I did do a svnadmin dump /export/svn > /test/file.dump >and I get a very small file, I restored it and it consists of > hook, format, lock, db, conf and its about 304 KB A dump shouldn't ever contain the hooks-directory or format file because normally those are not stored within a repository and dump only dumps repo contents. If you get a small file with those files and dirs, you probably dumped a repo with unusual content and the other project data is in other repos underneath your svn dir. You can make sure using ls in a shell on level export or export/svn and svn ls on level export/svn and post at least part of the output here. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Re: logging externals commit
On Sun, Oct 6, 2013 at 3:12 PM, Zvika Castel wrote: > > Hi, > > > > In general, it's about seeing the log of a commit to an externals file. > > I will try to describe the situation: > > I have folder named "Master" with file named "FileA.txt" in it. > > Somewhere in the project tree I have also a folder named "Slave" with an > externals "FileB.txt" pointing to "Master/FileA.txt" > > Now, on Update I get two files on my working directory tree, FileA under > Master and FileB under Slave. > > A developer changed "FileB.txt" and commit his changes (at this point changes > were made on FileA.txt because it's a "share"). > > Now, I open the log to see all the changes made on "Slave" folder and… > > There is not a single sign that someone has change "FileB.txt" > > > > I know what SVN is doing under the hood, I know I can see the log of "Master" > folder and see the transaction over there, but… > > What I expected, as a developer, that SVN will show me MY actions, not his. > > When I open the log of "Slave" folder I want to see that someone has changed > "FileB.txt". > > > > Consider this as a feature request. Searching the mailing list archives, this question has come up a couple of times: http://svn.haxx.se/users/archive-2013-08/0552.shtml http://svn.haxx.se/users/archive-2013-04/0119.shtml http://svn.haxx.se/users/archive-2011-08/0422.shtml http://svn.haxx.se/tsvn/archive-2010-04/0075.shtml But none of these threads really brings the discussion to a close (and it's not clear whether it's easily implementable within the current svn design). Maybe it's a good idea, whether or not it's doable, to at least add this to the issue tracker as a feature request. Zvika, feel free to enter this into the issue tracker. -- Johan
Re: svn backup
On 10/7/2013 3:37 PM, rvaede wrote: > > > I am confused on how to backup my repositary. Note: Making a raw file-level backup of a SVN repository is not advisable. There may be open files, files that changed while the backup is running, etc. So you will need to use one of the hotcopy / dump methods to get a good "snapshot" of the repository state for inclusion onto a backup tape/disk/set. If you want to backup everything, including server-side hook scripts and the like which are stored under the repository directory, take a look at "svnadmin hotcopy". It's essentially an rsync (but not quite) of the origin repository directory. The hotcopy directories (since they only change once per day, or whenever you do the hotcopy) are ideal for being used to backup the repository. http://svnbook.red-bean.com/nightly/en/svn.ref.svnadmin.c.hotcopy.html The "svnadmin dump" is more suitable for long-term archival of the SVN repository because it stores the data in platform-neutral format. It will be much larger then the original repository was (even with gzip -5) and will take a long time to perform the dump. http://svnbook.red-bean.com/nightly/en/svn.ref.svnadmin.c.dump.html The third option is to run a hot-spare system using the svn sync. Except that this does not give you generational backups, so you still need to use either hotcopy/dump as well. http://svnbook.red-bean.com/nightly/en/svn.ref.svnsync.html Personally: I prefer hotcopy for daily backups, then using rdiff-backup to make a backup of the hotcopy directory or our main backup server. The rdiff-backup step gives me the ability to go back to any day within the past 26 weeks (configurable). Combined with the use of generational media, I have multiple copies of the rdiff-backup target directory. (rsnapshot would also be a good choice.) I'll also make svnadmin dumps every few months, but it takes a long time to do, uses up a lot of disk space (3x for us) and has few advantages compared to the rdiff-backup of the hotcopy directory.
