[chkq76@chieftec DEV_youtube_4_4]$ svn pl .
eosu@leosu:/mnt/sda3/dev_iptv/DIGITALIS_telia_merge$ svn proplist .
Properties on '.':
kbs:logfilter
svn:ignore
svn:externals
kbs:interface_dirs
svn:mergeinfo
kbs:products
[chkq76@chieftec DEV_youtube_4_4]$ svn pg svn:mergeinfo . >tmp.info
$svn propget svn:mergeinfo | grep bsg/trunk
#svn merge --ignore-ancestry http://svn.ea.mot.com/dev/ifc/kreatel/hai/<A>/include http://svn.ea.mot.com/dev/ifc/kreatel/hai/branches/<branch name>@<B>/include
svn merge 不同的目录,有冲突的时候,可以添加 --ignore-ancestry
Svn replace file and dir;
deadwood
In order to keep bsg/branches clean and also as an effort to make sure no commits are made on branches which are dead, bsg/deadwood has been introduced.
svn mv http://svn.ea.mot.com/dev/bsg/branches/ITEM_X1234http://svn.ea.mot.com/dev/bsg/deadwood
Resolving Subversion conflicts
[user@buildserver food]$ svn st
[user@buildserver food]$ svn st | grep M
How to merge changes into a file which has been moved
cd <target component>
svn merge --ignore-ancestry component>@<r1> component>@<r2> .
What to do about a conflict in an svn:mergeinfo property?
This is how it would look like:
Conflict for property 'svn:mergeinfo' discovered on 'common/cpp/event/unittests'.
meld
Install on Fedora using yum install meld.
A diff and merge tool which can handle entire directories. It understands SVN and has a very nice handing of conflicts.
To look at SVN diffs/conflicts, simply start it with the file or directory in question as argument.
kdiff3
kdiff3 is a powerful merge tool. There are scripts in /home/tools/bin (http://svn.ea.mot.com/dev/devtools/trunk) that allows you to use it together with svn merge like this (make sure you can show X output on your screen, download Xming if in Windows):
--record-only
Leo, you can do the following on the merge branch to only record that a merge has been done without doing it.
This will skip that revision when merging a larger span where that revision is included then.
svn merge --record-only -c<rev> http://svn.ea.mot.com/dev/bsg/DIGITALIS_teliasvn commit -m "Blocked
This may lead to a situation where you have to run the merge command several times when doing the actual merge.
Since svn will divide the merge in to several intervals (between the skipped revisions), and will stop after a conflict is found in a merge interval.
When merging, this this command is useful to see that you have merged (and blocked) so far (run from the root of the branch)
svn pg svn:mergeinfo . | grep /DIGITALIS_telia:
extern merge:
查看externals属性
[chkq76@brora DEV_telia42_overblue]$svn propget svn:externals
makesystem http://svn.ea.mot.com/dev/make/makesystem/tags/33.1.2/makesystem
[chkq76@brora DEV_telia42_overblue]$ svn propget svn:externals .
makesystem http://svn.ea.mot.com/dev/make/makesystem/tags/33.1.2/makesystem
svn propget svn:externals .
编辑externals属性:
export SVN_EDITOR=vi && svn propedit svn:externals -r 133137 http://svn.ea.mot.com/dev/bsg/branches/BOBROV/hal/interface/hai
$svn pe svn:externals http://svn.ea.mot.com/dev/bsg/branches/ELYMUS_work
[chkq76@brora hai]$ pwd
[chkq76@brora hai]$ svn propget svn:externals .
include -r 133137 http://svn.ea.mot.com/dev/ifc/kreatel/hai/branches/BOBROV/include
extern ignore:
查看ignore属性
[chkq76@brora DIGITALIS_telia_merge]$ svn propget svn:ignore products/ip-stb/boot_image/custom/
*.bmp
编辑 ignore属性
export SVN_EDITOR=vi && svn propedit svn:ignore products/ip-stb/boot_image/custom/
若想创建了一个文件夹,并且把它加入版本控制,但忽略文件夹中的所有文件的内容:
$ svn mkdir spool
$ svn propset svn:ignore '*' spool
$ svn ci -m 'Adding "spool" and ignoring its contents.'
若想创建一个文件夹,但不加入版本控制,即忽略这个文件夹:
$ mkdir spool
$ svn propset svn:ignore 'spool' .
$ svn ci -m 'Ignoring a directory called "spool".'
若已经创建了文件夹,并加入了版本控制,现在想忽略这个文件夹,但要保持文件夹的内容:
$ svn export spool spool-tmp
$ svn rm spool
$ svn ci -m 'Removing inadvertently added directory "spool".'
$ mv spool-tmp spool
$ svn propset svn:ignore 'spool' .
$ svn ci -m 'Ignoring a directory called "spool".'
svn revert some version:
revert http://svn.ea.mot.com/dev/bsg/branches/DIGITALIS_telia_merge/platform/media/mediamanager@217085
#svn merge -c -217085 http://svn.ea.mot.com/dev/bsg/branches/DIGITALIS_telia_merge/platform/media/mediamanager
Can you please revert your commit by creating a branch, running
"svn merge -c -214582 http://svn.ea.mot.com/dev/bsg/trunk" on it,
清理掉所有非svn 文件: svn-clean
$svn st | grep "C "
! C patches
C applications/3pp/ekioh-webkit/proprietary/patches/use_clipped_blits.patch
C applications/3pp/ekioh-webkit/proprietary/patches/ektimer.patch
C applications/3pp/ekioh-webkit/proprietary/patches/busyloop.patch
C applications/3pp/ekioh-webkit/opensource/patches/fix_is_plugin_view.patch
$ svn info patches 查看冲突信息
$ svn info applications/3pp/ekioh-webkit/proprietary/patches/use_clipped_blits.patch 查看冲突信息
5) Queue a build of ITEM_P1826 with high priority(9 is the highest now, it's better use fedora 10 and 11 build server now), and wait it building OK
AAAA merge info
I think it may have something to do with mergeinfo.Use this list to check that you have fulfilled trunk entry criteria. Details: look atMergeQueue. http://wiki.mot-mobility.com/bin/view/KreaTV/MergeQueue