[Digikam-devel] Re: kipi-plugins 2.0 branch merged

[sean darcy]

On 03/01/2011 03:51 PM, Marcel Wiesweg wrote:
> Hi,
>
> the "2.0" branch of kipi-plugins has been merged to master,
> heading for KDE 4.7.
> In your local repositories, checkout master, pull, delete your local 2.0
> branch, and cleanup:
> git checkout master
> git pull
> git branch -d 2.0
> git remote prune origin
> (assuming you have no local commits. If you have, rebase or cherry-pick)
>
> Marcel

I'm sorry to be so clueless, but:

git clone
git:kde:digikam-software-compilation digikam-sc.2

./download-repos
Cloning into core...

[video at sixcore digikam-sc.2]$ git checkout master
Already on 'master'
[video at sixcore digikam-sc.2]$ git pull
remote: Counting objects: 35, done.
remote: Compressing objects: 100% (24/24), done.
remote: Total 30 (delta 15), reused 0 (delta 0)
Unpacking objects: 100% (30/30), done.
 From git://anongit.kde.org/digikam-software-compilation
    12d0b91..b62f395  master     -> origin/master
Updating 12d0b91..b62f395
Fast-forward
  .gitslave                     |    3 +
  CMakeLists.txt                |   10 ++-
  cmake/modules/FindKSane.cmake |  156 
+++++++++++++++++++++++++++++++++++++++++
  doc/CMakeLists.txt            |   27 +++++++
  download-repos                |    5 +-
  extra/CMakeLists.txt          |    1 +
  6 files changed, 196 insertions(+), 6 deletions(-)
  create mode 100644 cmake/modules/FindKSane.cmake
  create mode 100644 doc/CMakeLists.txt
[video at sixcore digikam-sc.2]$ git branch -d 2.0
error: branch '2.0' not found.


sean